version 1.295, 2015/10/12 00:08:16 |
version 1.297, 2015/10/19 20:04:10 |
|
|
post_bf(POST_ARGS) |
post_bf(POST_ARGS) |
{ |
{ |
struct roff_node *np, *nch; |
struct roff_node *np, *nch; |
enum mdocargt arg; |
|
|
|
/* |
/* |
* Unlike other data pointers, these are "housed" by the HEAD |
* Unlike other data pointers, these are "housed" by the HEAD |
Line 771 post_bf(POST_ARGS) |
|
Line 770 post_bf(POST_ARGS) |
|
return; |
return; |
|
|
assert(np->parent->type == ROFFT_BLOCK); |
assert(np->parent->type == ROFFT_BLOCK); |
assert(MDOC_Bf == np->parent->tok); |
assert(np->parent->tok == MDOC_Bf); |
|
|
/* Check the number of arguments. */ |
/* Check the number of arguments. */ |
|
|
nch = np->child; |
nch = np->child; |
if (NULL == np->parent->args) { |
if (np->parent->args == NULL) { |
if (NULL == nch) { |
if (nch == NULL) { |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
np->line, np->pos, "Bf"); |
np->line, np->pos, "Bf"); |
return; |
return; |
} |
} |
nch = nch->next; |
nch = nch->next; |
} |
} |
if (NULL != nch) |
if (nch != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
nch->line, nch->pos, "Bf ... %s", nch->string); |
nch->line, nch->pos, "Bf ... %s", nch->string); |
|
|
/* Extract argument into data. */ |
/* Extract argument into data. */ |
|
|
if (np->parent->args) { |
if (np->parent->args != NULL) { |
arg = np->parent->args->argv[0].arg; |
switch (np->parent->args->argv[0].arg) { |
if (MDOC_Emphasis == arg) |
case MDOC_Emphasis: |
np->norm->Bf.font = FONT_Em; |
np->norm->Bf.font = FONT_Em; |
else if (MDOC_Literal == arg) |
break; |
|
case MDOC_Literal: |
np->norm->Bf.font = FONT_Li; |
np->norm->Bf.font = FONT_Li; |
else if (MDOC_Symbolic == arg) |
break; |
|
case MDOC_Symbolic: |
np->norm->Bf.font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
break; |
|
default: |
abort(); |
abort(); |
|
} |
return; |
return; |
} |
} |
|
|
/* Extract parameter into data. */ |
/* Extract parameter into data. */ |
|
|
if (0 == strcmp(np->child->string, "Em")) |
if ( ! strcmp(np->child->string, "Em")) |
np->norm->Bf.font = FONT_Em; |
np->norm->Bf.font = FONT_Em; |
else if (0 == strcmp(np->child->string, "Li")) |
else if ( ! strcmp(np->child->string, "Li")) |
np->norm->Bf.font = FONT_Li; |
np->norm->Bf.font = FONT_Li; |
else if (0 == strcmp(np->child->string, "Sy")) |
else if ( ! strcmp(np->child->string, "Sy")) |
np->norm->Bf.font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
Line 843 post_eoln(POST_ARGS) |
|
Line 846 post_eoln(POST_ARGS) |
|
const struct roff_node *n; |
const struct roff_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
if (n->child) |
if (n->child != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
"%s %s", mdoc_macronames[n->tok], |
"%s %s", mdoc_macronames[n->tok], |
Line 932 post_nm(POST_ARGS) |
|
Line 935 post_nm(POST_ARGS) |
|
n->last->tok == MDOC_Lp)) |
n->last->tok == MDOC_Lp)) |
mdoc_node_relink(mdoc, n->last); |
mdoc_node_relink(mdoc, n->last); |
|
|
if (NULL != mdoc->meta.name) |
if (mdoc->meta.name != NULL) |
return; |
return; |
|
|
deroff(&mdoc->meta.name, n); |
deroff(&mdoc->meta.name, n); |
|
|
if (NULL == mdoc->meta.name) |
if (mdoc->meta.name == NULL) |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
n->line, n->pos, "Nm"); |
n->line, n->pos, "Nm"); |
} |
} |
Line 1009 post_defaults(POST_ARGS) |
|
Line 1012 post_defaults(POST_ARGS) |
|
* gets an empty string. |
* gets an empty string. |
*/ |
*/ |
|
|
if (mdoc->last->child) |
if (mdoc->last->child != NULL) |
return; |
return; |
|
|
nn = mdoc->last; |
nn = mdoc->last; |
Line 1053 post_at(POST_ARGS) |
|
Line 1056 post_at(POST_ARGS) |
|
|
|
n = n->child; |
n = n->child; |
assert(n->type == ROFFT_TEXT); |
assert(n->type == ROFFT_TEXT); |
if (NULL == (std_att = mdoc_a2att(n->string))) { |
if ((std_att = mdoc_a2att(n->string)) == NULL) { |
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
n->line, n->pos, "At %s", n->string); |
n->line, n->pos, "At %s", n->string); |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
Line 1142 post_it(POST_ARGS) |
|
Line 1145 post_it(POST_ARGS) |
|
|
|
assert(nit->head->child == NULL); |
assert(nit->head->child == NULL); |
|
|
for (i = 0, nch = nit->child; nch; nch = nch->next) |
i = 0; |
|
for (nch = nit->child; nch != NULL; nch = nch->next) |
if (nch->type == ROFFT_BODY) |
if (nch->type == ROFFT_BODY) |
i++; |
i++; |
|
|
Line 1171 post_bl_block(POST_ARGS) |
|
Line 1175 post_bl_block(POST_ARGS) |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (LIST_tag == n->norm->Bl.type && |
if (n->norm->Bl.type == LIST_tag && |
NULL == n->norm->Bl.width) { |
n->norm->Bl.width == NULL) { |
post_bl_block_tag(mdoc); |
post_bl_block_tag(mdoc); |
assert(n->norm->Bl.width); |
assert(n->norm->Bl.width != NULL); |
} |
} |
|
|
for (ni = n->body->child; ni; ni = ni->next) { |
for (ni = n->body->child; ni != NULL; ni = ni->next) { |
if (NULL == ni->body) |
if (ni->body == NULL) |
continue; |
continue; |
nc = ni->body->last; |
nc = ni->body->last; |
while (NULL != nc) { |
while (nc != NULL) { |
switch (nc->tok) { |
switch (nc->tok) { |
case MDOC_Pp: |
case MDOC_Pp: |
case MDOC_Lp: |
case MDOC_Lp: |
Line 1191 post_bl_block(POST_ARGS) |
|
Line 1195 post_bl_block(POST_ARGS) |
|
nc = NULL; |
nc = NULL; |
continue; |
continue; |
} |
} |
if (NULL == ni->next) { |
if (ni->next == NULL) { |
mandoc_msg(MANDOCERR_PAR_MOVE, |
mandoc_msg(MANDOCERR_PAR_MOVE, |
mdoc->parse, nc->line, nc->pos, |
mdoc->parse, nc->line, nc->pos, |
mdoc_macronames[nc->tok]); |
mdoc_macronames[nc->tok]); |
mdoc_node_relink(mdoc, nc); |
mdoc_node_relink(mdoc, nc); |
} else if (0 == n->norm->Bl.comp && |
} else if (n->norm->Bl.comp == 0 && |
LIST_column != n->norm->Bl.type) { |
n->norm->Bl.type != LIST_column) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mdoc->parse, nc->line, nc->pos, |
mdoc->parse, nc->line, nc->pos, |
"%s before It", |
"%s before It", |
Line 1251 post_bl_block_tag(POST_ARGS) |
|
Line 1255 post_bl_block_tag(POST_ARGS) |
|
sz = 10; |
sz = 10; |
n = mdoc->last; |
n = mdoc->last; |
|
|
for (nn = n->body->child; nn; nn = nn->next) { |
for (nn = n->body->child; nn != NULL; nn = nn->next) { |
if (MDOC_It != nn->tok) |
if (nn->tok != MDOC_It) |
continue; |
continue; |
|
|
assert(nn->type == ROFFT_BLOCK); |
assert(nn->type == ROFFT_BLOCK); |
Line 1281 post_bl_block_tag(POST_ARGS) |
|
Line 1285 post_bl_block_tag(POST_ARGS) |
|
* We're guaranteed that a MDOC_Width doesn't already exist. |
* We're guaranteed that a MDOC_Width doesn't already exist. |
*/ |
*/ |
|
|
assert(n->args); |
assert(n->args != NULL); |
i = (int)(n->args->argc)++; |
i = (int)(n->args->argc)++; |
|
|
n->args->argv = mandoc_reallocarray(n->args->argv, |
n->args->argv = mandoc_reallocarray(n->args->argv, |
Line 1414 post_bl(POST_ARGS) |
|
Line 1418 post_bl(POST_ARGS) |
|
* Unlink this child. |
* Unlink this child. |
*/ |
*/ |
|
|
assert(NULL == nchild->prev); |
assert(nchild->prev == NULL); |
if (0 == --nbody->nchild) { |
if (--nbody->nchild == 0) { |
nbody->child = NULL; |
nbody->child = NULL; |
nbody->last = NULL; |
nbody->last = NULL; |
assert(NULL == nnext); |
assert(nnext == NULL); |
} else { |
} else { |
nbody->child = nnext; |
nbody->child = nnext; |
nnext->prev = NULL; |
nnext->prev = NULL; |
Line 1434 post_bl(POST_ARGS) |
|
Line 1438 post_bl(POST_ARGS) |
|
|
|
nblock->prev = nchild; |
nblock->prev = nchild; |
nparent->nchild++; |
nparent->nchild++; |
if (NULL == nprev) |
if (nprev == NULL) |
nparent->child = nchild; |
nparent->child = nchild; |
else |
else |
nprev->next = nchild; |
nprev->next = nchild; |
Line 1458 post_bk(POST_ARGS) |
|
Line 1462 post_bk(POST_ARGS) |
|
} |
} |
|
|
static void |
static void |
post_sm(struct roff_man *mdoc) |
post_sm(POST_ARGS) |
{ |
{ |
struct roff_node *nch; |
struct roff_node *nch; |
|
|
Line 1539 post_st(POST_ARGS) |
|
Line 1543 post_st(POST_ARGS) |
|
|
|
assert(nch->type == ROFFT_TEXT); |
assert(nch->type == ROFFT_TEXT); |
|
|
if (NULL == (p = mdoc_a2st(nch->string))) { |
if ((p = mdoc_a2st(nch->string)) == NULL) { |
mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse, |
nch->line, nch->pos, "St %s", nch->string); |
nch->line, nch->pos, "St %s", nch->string); |
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
|
|
post_ns(POST_ARGS) |
post_ns(POST_ARGS) |
{ |
{ |
|
|
if (MDOC_LINE & mdoc->last->flags) |
if (mdoc->last->flags & MDOC_LINE) |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
} |
} |
Line 1837 post_sh_head(POST_ARGS) |
|
Line 1841 post_sh_head(POST_ARGS) |
|
*/ |
*/ |
|
|
secname = NULL; |
secname = NULL; |
sec = SEC_CUSTOM; |
|
deroff(&secname, mdoc->last); |
deroff(&secname, mdoc->last); |
sec = NULL == secname ? SEC_CUSTOM : a2sec(secname); |
sec = NULL == secname ? SEC_CUSTOM : a2sec(secname); |
|
|
Line 1873 post_sh_head(POST_ARGS) |
|
Line 1876 post_sh_head(POST_ARGS) |
|
|
|
mdoc->last->parent->sec = sec; |
mdoc->last->parent->sec = sec; |
mdoc->last->sec = sec; |
mdoc->last->sec = sec; |
for (n = mdoc->last->child; n; n = n->next) |
for (n = mdoc->last->child; n != NULL; n = n->next) |
n->sec = sec; |
n->sec = sec; |
|
|
/* We don't care about custom sections after this. */ |
/* We don't care about custom sections after this. */ |
Line 1955 post_ignpar(POST_ARGS) |
|
Line 1958 post_ignpar(POST_ARGS) |
|
return; |
return; |
} |
} |
|
|
if (NULL != (np = mdoc->last->child)) |
if ((np = mdoc->last->child) != NULL) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mdoc->parse, np->line, np->pos, |
mdoc->parse, np->line, np->pos, |
"%s after %s", mdoc_macronames[np->tok], |
"%s after %s", mdoc_macronames[np->tok], |
Line 1964 post_ignpar(POST_ARGS) |
|
Line 1967 post_ignpar(POST_ARGS) |
|
roff_node_delete(mdoc, np); |
roff_node_delete(mdoc, np); |
} |
} |
|
|
if (NULL != (np = mdoc->last->last)) |
if ((np = mdoc->last->last) != NULL) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
np->line, np->pos, "%s at the end of %s", |
np->line, np->pos, "%s at the end of %s", |
mdoc_macronames[np->tok], |
mdoc_macronames[np->tok], |
Line 2023 post_par(POST_ARGS) |
|
Line 2026 post_par(POST_ARGS) |
|
mdoc->parse, np->line, np->pos, "%s %s", |
mdoc->parse, np->line, np->pos, "%s %s", |
mdoc_macronames[np->tok], np->child->string); |
mdoc_macronames[np->tok], np->child->string); |
|
|
if (NULL == (np = mdoc->last->prev)) { |
if ((np = mdoc->last->prev) == NULL) { |
np = mdoc->last->parent; |
np = mdoc->last->parent; |
if (MDOC_Sh != np->tok && MDOC_Ss != np->tok) |
if (np->tok != MDOC_Sh && np->tok != MDOC_Ss) |
return; |
return; |
} else if (MDOC_Pp != np->tok && MDOC_Lp != np->tok && |
} else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp && |
(MDOC_br != mdoc->last->tok || |
(mdoc->last->tok != MDOC_br || |
(MDOC_sp != np->tok && MDOC_br != np->tok))) |
(np->tok != MDOC_sp && np->tok != MDOC_br))) |
return; |
return; |
|
|
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
Line 2078 post_dd(POST_ARGS) |
|
Line 2081 post_dd(POST_ARGS) |
|
free(mdoc->meta.date); |
free(mdoc->meta.date); |
|
|
n = mdoc->last; |
n = mdoc->last; |
if (NULL == n->child || '\0' == n->child->string[0]) { |
if (n->child == NULL || n->child->string[0] == '\0') { |
mdoc->meta.date = mdoc->quick ? mandoc_strdup("") : |
mdoc->meta.date = mdoc->quick ? mandoc_strdup("") : |
mandoc_normdate(mdoc->parse, NULL, n->line, n->pos); |
mandoc_normdate(mdoc->parse, NULL, n->line, n->pos); |
goto out; |
goto out; |
Line 2193 post_bx(POST_ARGS) |
|
Line 2196 post_bx(POST_ARGS) |
|
* uppercase blindly. |
* uppercase blindly. |
*/ |
*/ |
|
|
n = mdoc->last->child; |
if ((n = mdoc->last->child) != NULL && (n = n->next) != NULL) |
if (n && NULL != (n = n->next)) |
|
*n->string = (char)toupper((unsigned char)*n->string); |
*n->string = (char)toupper((unsigned char)*n->string); |
} |
} |
|
|
Line 2232 post_os(POST_ARGS) |
|
Line 2234 post_os(POST_ARGS) |
|
#ifdef OSNAME |
#ifdef OSNAME |
mdoc->meta.os = mandoc_strdup(OSNAME); |
mdoc->meta.os = mandoc_strdup(OSNAME); |
#else /*!OSNAME */ |
#else /*!OSNAME */ |
if (NULL == defbuf) { |
if (defbuf == NULL) { |
if (-1 == uname(&utsname)) { |
if (uname(&utsname) == -1) { |
mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse, |
mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse, |
n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
defbuf = mandoc_strdup("UNKNOWN"); |
defbuf = mandoc_strdup("UNKNOWN"); |
Line 2259 post_ex(POST_ARGS) |
|
Line 2261 post_ex(POST_ARGS) |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (n->child) |
if (n->child != NULL) |
return; |
return; |
|
|
if (mdoc->meta.name == NULL) { |
if (mdoc->meta.name == NULL) { |