version 1.73, 2010/07/01 22:35:54 |
version 1.76, 2010/07/13 23:53:20 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 696 post_bl_tagwidth(POST_ARGS) |
|
Line 696 post_bl_tagwidth(POST_ARGS) |
|
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
/* Set our width! */ |
/* Set our width! */ |
n->data.Bl.width = n->args->argv[i].value[0]; |
n->data.Bl->width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 719 post_bl_width(POST_ARGS) |
|
Line 719 post_bl_width(POST_ARGS) |
|
* the macro's width as set in share/tmac/mdoc/doc-common. |
* the macro's width as set in share/tmac/mdoc/doc-common. |
*/ |
*/ |
|
|
if (0 == strcmp(n->data.Bl.width, "Ds")) |
if (0 == strcmp(n->data.Bl->width, "Ds")) |
width = 6; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl.width))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) |
else if (0 == (width = mdoc_macro2len(tok))) |
return(mdoc_nmsg(m, n, MANDOCERR_BADWIDTH)); |
return(mdoc_nmsg(m, n, MANDOCERR_BADWIDTH)); |
Line 741 post_bl_width(POST_ARGS) |
|
Line 741 post_bl_width(POST_ARGS) |
|
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
/* Set our width! */ |
/* Set our width! */ |
n->data.Bl.width = n->args->argv[i].value[0]; |
n->data.Bl->width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 757 post_bl_head(POST_ARGS) |
|
Line 757 post_bl_head(POST_ARGS) |
|
int i, c; |
int i, c; |
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *np, *nn, *nnp; |
|
|
if (LIST_column != n->data.Bl.type) |
if (LIST_column != n->data.Bl->type) |
return(1); |
return(1); |
else if (NULL == n->child) |
else if (NULL == n->child) |
return(1); |
return(1); |
Line 782 post_bl_head(POST_ARGS) |
|
Line 782 post_bl_head(POST_ARGS) |
|
np->args->argv[c].value = mandoc_malloc |
np->args->argv[c].value = mandoc_malloc |
((size_t)n->nchild * sizeof(char *)); |
((size_t)n->nchild * sizeof(char *)); |
|
|
|
n->data.Bl->ncols = np->args->argv[c].sz; |
|
n->data.Bl->cols = (const char **)np->args->argv[c].value; |
|
|
for (i = 0, nn = n->child; nn; i++) { |
for (i = 0, nn = n->child; nn; i++) { |
np->args->argv[c].value[i] = nn->string; |
np->args->argv[c].value[i] = nn->string; |
nn->string = NULL; |
nn->string = NULL; |
Line 799 post_bl_head(POST_ARGS) |
|
Line 802 post_bl_head(POST_ARGS) |
|
static int |
static int |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
struct mdoc_node *nn; |
|
const char *ww; |
|
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(post_bl_head(m, n)); |
return(post_bl_head(m, n)); |
Line 815 post_bl(POST_ARGS) |
|
Line 816 post_bl(POST_ARGS) |
|
* rewritten into real lengths). |
* rewritten into real lengths). |
*/ |
*/ |
|
|
ww = n->data.Bl.width; |
if (LIST_tag == n->data.Bl->type && NULL == n->data.Bl->width) { |
|
|
if (LIST_tag == n->data.Bl.type && NULL == n->data.Bl.width) { |
|
if ( ! post_bl_tagwidth(m, n)) |
if ( ! post_bl_tagwidth(m, n)) |
return(0); |
return(0); |
} else if (NULL != n->data.Bl.width) { |
} else if (NULL != n->data.Bl->width) { |
if ( ! post_bl_width(m, n)) |
if ( ! post_bl_width(m, n)) |
return(0); |
return(0); |
} else |
} else |
return(1); |
return(1); |
|
|
assert(n->data.Bl.width); |
assert(n->data.Bl->width); |
|
|
/* If it has changed, propogate new width to children. */ |
|
|
|
if (ww == n->data.Bl.width) |
|
return(1); |
|
|
|
for (nn = n->child; nn; nn = nn->next) |
|
if (MDOC_Bl == nn->tok) |
|
nn->data.Bl.width = n->data.Bl.width; |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 967 pre_bd(PRE_ARGS) |
|
Line 956 pre_bd(PRE_ARGS) |
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
return(1); |
return(1); |
|
|
if (DISP_literal == n->data.Bd.type) |
assert(n->data.Bd); |
|
if (DISP_literal == n->data.Bd->type) |
m->flags |= MDOC_LITERAL; |
m->flags |= MDOC_LITERAL; |
if (DISP_unfilled == n->data.Bd.type) |
if (DISP_unfilled == n->data.Bd->type) |
m->flags |= MDOC_LITERAL; |
m->flags |= MDOC_LITERAL; |
|
|
return(1); |
return(1); |