version 1.69, 2010/06/13 20:05:12 |
version 1.71, 2010/06/19 20:46:28 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009 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 52 static int post_at(POST_ARGS); |
|
Line 52 static int post_at(POST_ARGS); |
|
static int post_bl(POST_ARGS); |
static int post_bl(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
static int post_bl_tagwidth(POST_ARGS); |
static int post_bl_tagwidth(POST_ARGS); |
static int post_bl_width(struct mdoc *, |
static int post_bl_width(POST_ARGS); |
struct mdoc_node *, int); |
|
static int post_dd(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_display(POST_ARGS); |
static int post_display(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_dt(POST_ARGS); |
Line 667 post_bl_tagwidth(POST_ARGS) |
|
Line 666 post_bl_tagwidth(POST_ARGS) |
|
* We're guaranteed that a MDOC_Width doesn't already exist. |
* We're guaranteed that a MDOC_Width doesn't already exist. |
*/ |
*/ |
|
|
nn = n; |
assert(n->args); |
assert(nn->args); |
i = (int)(n->args->argc)++; |
i = (int)(nn->args->argc)++; |
|
|
|
nn->args->argv = mandoc_realloc(nn->args->argv, |
n->args->argv = mandoc_realloc(n->args->argv, |
nn->args->argc * sizeof(struct mdoc_argv)); |
n->args->argc * sizeof(struct mdoc_argv)); |
|
|
nn->args->argv[i].arg = MDOC_Width; |
n->args->argv[i].arg = MDOC_Width; |
nn->args->argv[i].line = n->line; |
n->args->argv[i].line = n->line; |
nn->args->argv[i].pos = n->pos; |
n->args->argv[i].pos = n->pos; |
nn->args->argv[i].sz = 1; |
n->args->argv[i].sz = 1; |
nn->args->argv[i].value = mandoc_malloc(sizeof(char *)); |
n->args->argv[i].value = mandoc_malloc(sizeof(char *)); |
nn->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
|
/* Set our width! */ |
|
n->data.Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 690 post_bl_tagwidth(POST_ARGS) |
|
Line 691 post_bl_tagwidth(POST_ARGS) |
|
* scaling width. |
* scaling width. |
*/ |
*/ |
static int |
static int |
post_bl_width(struct mdoc *m, struct mdoc_node *n, int pos) |
post_bl_width(POST_ARGS) |
{ |
{ |
size_t width; |
size_t width; |
|
int i; |
enum mdoct tok; |
enum mdoct tok; |
char buf[NUMSIZ]; |
char buf[NUMSIZ]; |
char *p; |
|
|
|
assert(n->args); |
|
p = n->args->argv[pos].value[0]; |
|
|
|
/* |
/* |
* If the value to -width is a macro, then we re-write it to be |
* If the value to -width is a macro, then we re-write it to be |
* 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(p, "Ds")) |
if (0 == strcmp(n->data.Bl.width, "Ds")) |
width = 6; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(p))) |
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)); |
|
|
/* The value already exists: free and reallocate it. */ |
/* The value already exists: free and reallocate it. */ |
|
|
|
assert(n->args); |
|
|
|
for (i = 0; i < (int)n->args->argc; i++) |
|
if (MDOC_Width == n->args->argv[i].arg) |
|
break; |
|
|
|
assert(i < (int)n->args->argc); |
|
|
snprintf(buf, NUMSIZ, "%zun", width); |
snprintf(buf, NUMSIZ, "%zun", width); |
free(n->args->argv[pos].value[0]); |
free(n->args->argv[i].value[0]); |
n->args->argv[pos].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
|
/* Set our width! */ |
|
n->data.Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 774 post_bl_head(POST_ARGS) |
|
Line 783 post_bl_head(POST_ARGS) |
|
static int |
static int |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
int i, r, len, width; |
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 789 post_bl(POST_ARGS) |
|
Line 799 post_bl(POST_ARGS) |
|
* rewritten into real lengths). |
* rewritten into real lengths). |
*/ |
*/ |
|
|
len = (int)(n->args ? n->args->argc : 0); |
ww = n->data.Bl.width; |
|
|
width = -1; |
if (LIST_tag == n->data.Bl.type && NULL == n->data.Bl.width) { |
|
|
for (r = i = 0; i < len; i++) { |
|
if (MDOC_Tag == n->args->argv[i].arg) |
|
r |= 1 << 0; |
|
if (MDOC_Width == n->args->argv[i].arg) { |
|
width = i; |
|
r |= 1 << 1; |
|
} |
|
} |
|
|
|
if (r & (1 << 0) && ! (r & (1 << 1))) { |
|
if ( ! post_bl_tagwidth(m, n)) |
if ( ! post_bl_tagwidth(m, n)) |
return(0); |
return(0); |
} else if (r & (1 << 1)) |
} else if (NULL != n->data.Bl.width) { |
if ( ! post_bl_width(m, n, width)) |
if ( ! post_bl_width(m, n)) |
return(0); |
return(0); |
|
} else |
|
return(1); |
|
|
|
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 827 post_pa(POST_ARGS) |
|
Line 839 post_pa(POST_ARGS) |
|
|
|
np = n; |
np = n; |
m->next = MDOC_NEXT_CHILD; |
m->next = MDOC_NEXT_CHILD; |
/* XXX: make into macro value. */ |
|
if ( ! mdoc_word_alloc(m, n->line, n->pos, "~")) |
if ( ! mdoc_word_alloc(m, n->line, n->pos, "~")) |
return(0); |
return(0); |
m->last = np; |
m->last = np; |