mandoc/mdoc_term.c - diff

Return to mdoc_term.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_term.c between version 1.32 and 1.49

version 1.32, 2009/07/12 19:28:46

version 1.49, 2009/07/20 19:30:46

Line 127 static int termp__t_pre(DECL_ARGS);

static int termp_ap_pre(DECL_ARGS);

static int termp_aq_pre(DECL_ARGS);

static int termp_ar_pre(DECL_ARGS);

static int termp_at_pre(DECL_ARGS);

static int termp_bd_pre(DECL_ARGS);

static int termp_bf_pre(DECL_ARGS);

static int termp_bq_pre(DECL_ARGS);

static int termp_br_pre(DECL_ARGS);

static int termp_brq_pre(DECL_ARGS);

static int termp_bt_pre(DECL_ARGS);

static int termp_cd_pre(DECL_ARGS);

Line 148 static int termp_ft_pre(DECL_ARGS);

static int termp_ic_pre(DECL_ARGS);

static int termp_in_pre(DECL_ARGS);

static int termp_it_pre(DECL_ARGS);

static int termp_lb_pre(DECL_ARGS);

static int termp_lk_pre(DECL_ARGS);

static int termp_ms_pre(DECL_ARGS);

static int termp_mt_pre(DECL_ARGS);

Line 165 static int termp_rs_pre(DECL_ARGS);

Line 164 static int termp_rs_pre(DECL_ARGS);

static int termp_rv_pre(DECL_ARGS);

static int termp_sh_pre(DECL_ARGS);

static int termp_sm_pre(DECL_ARGS);

static int termp_sp_pre(DECL_ARGS);

static int termp_sq_pre(DECL_ARGS);

static int termp_ss_pre(DECL_ARGS);

static int termp_st_pre(DECL_ARGS);

static int termp_sx_pre(DECL_ARGS);

static int termp_sy_pre(DECL_ARGS);

static int termp_ud_pre(DECL_ARGS);

Line 214 static const struct termact termacts[MDOC_MAX] = {

Line 213 static const struct termact termacts[MDOC_MAX] = {

{ NULL, NULL }, /* Ot */

{ termp_pa_pre, NULL }, /* Pa */

{ termp_rv_pre, NULL }, /* Rv */

{ termp_st_pre, NULL }, /* St */

{ NULL, NULL }, /* St */

{ termp_va_pre, NULL }, /* Va */

{ termp_vt_pre, termp_vt_post }, /* Vt */

{ termp_xr_pre, NULL }, /* Xr */

Line 232 static const struct termact termacts[MDOC_MAX] = {

Line 231 static const struct termact termacts[MDOC_MAX] = {

{ NULL, NULL }, /* Ac */

{ termp_aq_pre, termp_aq_post }, /* Ao */

{ termp_aq_pre, termp_aq_post }, /* Aq */

{ termp_at_pre, NULL }, /* At */

{ NULL, NULL }, /* At */

{ NULL, NULL }, /* Bc */

{ termp_bf_pre, NULL }, /* Bf */

{ termp_bq_pre, termp_bq_post }, /* Bo */

Line 283 static const struct termact termacts[MDOC_MAX] = {

Line 282 static const struct termact termacts[MDOC_MAX] = {

{ NULL, NULL }, /* Hf */

{ NULL, NULL }, /* Fr */

{ termp_ud_pre, NULL }, /* Ud */

{ termp_lb_pre, termp_lb_post }, /* Lb */

{ NULL, termp_lb_post }, /* Lb */

{ termp_pp_pre, NULL }, /* Lp */

{ termp_lk_pre, NULL }, /* Lk */

{ termp_mt_pre, NULL }, /* Mt */

Line 295 static const struct termact termacts[MDOC_MAX] = {

Line 294 static const struct termact termacts[MDOC_MAX] = {

{ NULL, NULL }, /* En */

{ termp_xx_pre, NULL }, /* Dx */

{ NULL, NULL }, /* %Q */

{ termp_br_pre, NULL }, /* br */

{ termp_sp_pre, NULL }, /* sp */

};

#ifdef __linux__

Line 363 print_node(DECL_ARGS)

Line 364 print_node(DECL_ARGS)

npair.flag = 0;

npair.count = 0;

* Note on termpair. This allows a pre function to set a termp

* flag that is automatically unset after the body, but before

* the post function. Thus, if a pre uses a termpair flag, it

* must be reapplied in the post for use.

if (MDOC_TEXT != node->type) {

if (termacts[node->tok].pre)

if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node))

Line 377 print_node(DECL_ARGS)

Line 385 print_node(DECL_ARGS)

if (dochild && node->child)

print_body(p, &npair, meta, node->child);

p->flags &= ~npair.flag;

/* Post-processing. */

if (MDOC_TEXT != node->type)

Line 385 print_node(DECL_ARGS)

Line 395 print_node(DECL_ARGS)

p->offset = offset;

p->rmargin = rmargin;

p->flags &= ~npair.flag;

}

Line 410 print_foot(struct termp *p, const struct mdoc_meta *me

Line 419 print_foot(struct termp *p, const struct mdoc_meta *me

tm = localtime(&meta->date);

if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))

if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))

err(1, "strftime");

(void)strlcpy(os, meta->os, p->rmargin);

Line 520 print_head(struct termp *p, const struct mdoc_meta *me

Line 529 print_head(struct termp *p, const struct mdoc_meta *me

static size_t

arg_width(const struct mdoc_argv *arg, int pos)

{

size_t v;

int i, len;

const char *p;

assert(pos < (int)arg->sz && pos >= 0);

assert(arg->value[pos]);

if (0 == (len = (int)strlen(arg->value[pos])))

p = arg->value[pos];

if (0 == (len = (int)strlen(p)))

return(0);

for (i = 0; i < len - 1; i++)

if ( ! isdigit((u_char)arg->value[pos][i]))

if ( ! isdigit((u_char)p[i]))

break;

if (i == len - 1) {

if (i == len - 1)

if ('n' == arg->value[pos][len - 1] ||

if ('n' == p[len - 1] || 'm' == p[len - 1])

'm' == arg->value[pos][len - 1]) {

return((size_t)atoi(p) + 2);

v = (size_t)atoi(arg->value[pos]);

return(v + 2);

}

return((size_t)len + 2);

return(strlen(arg->value[pos]) + 2);

}

Line 574 arg_listtype(const struct mdoc_node *n)

Line 581 arg_listtype(const struct mdoc_node *n)

/* FALLTHROUGH */

case (MDOC_Column):

/* FALLTHROUGH */

case (MDOC_Hang):

/* FALLTHROUGH */

case (MDOC_Ohang):

return(n->args->argv[i].arg);

default:

break;

}

/* FIXME: mandated by parser. */

return(-1);

errx(1, "list type not supported");

/* NOTREACHED */

}

static size_t

arg_offset(const struct mdoc_argv *arg)

{

int len, i;

const char *p;

assert(*arg->value);

if (0 == strcmp(*arg->value, "left"))

p = *arg->value;

if (0 == strcmp(p, "left"))

return(0);

if (0 == strcmp(*arg->value, "indent"))

if (0 == strcmp(p, "indent"))

return(INDENT + 1);

if (0 == strcmp(*arg->value, "indent-two"))

if (0 == strcmp(p, "indent-two"))

return((INDENT + 1) * 2);

/* FIXME: needs to support field-widths (10n, etc.). */

if (0 == (len = (int)strlen(p)))

return(0);

return(strlen(*arg->value));

for (i = 0; i < len - 1; i++)

if ( ! isdigit((u_char)p[i]))

break;

if (i == len - 1)

if ('n' == p[len - 1] || 'm' == p[len - 1])

return((size_t)atoi(p));

return((size_t)len);

}

Line 653 fmt_block_vspace(struct termp *p,

Line 672 fmt_block_vspace(struct termp *p,

if (arg_hasattr(MDOC_Compact, bl))

return(1);

/* XXX - not documented! */

else if (arg_hasattr(MDOC_Column, bl))

return(1);

for (n = node; n; n = n->parent) {

if (MDOC_BLOCK != n->type)

Line 704 termp_it_pre(DECL_ARGS)

Line 726 termp_it_pre(DECL_ARGS)

{

const struct mdoc_node *bl, *n;

char buf[7];

int i, type, keys[3], vals[3], sv;

int i, type, keys[3], vals[3];

size_t width, offset;

if (MDOC_BLOCK == node->type)

Line 729 termp_it_pre(DECL_ARGS)

Line 751 termp_it_pre(DECL_ARGS)

(void)arg_getattrs(keys, vals, 3, bl);

type = arg_listtype(bl);

assert(-1 != type);

/* Calculate real width and offset. */

Line 755 termp_it_pre(DECL_ARGS)

Line 778 termp_it_pre(DECL_ARGS)

* List-type can override the width in the case of fixed-head

* values (bullet, dash/hyphen, enum). Tags need a non-zero

* offset.

* offset. FIXME: double-check that correct.

switch (type) {

Line 771 termp_it_pre(DECL_ARGS)

Line 794 termp_it_pre(DECL_ARGS)

if (width < 5)

width = 5;

break;

case (MDOC_Hang):

if (0 == width)

width = 8;

break;

case (MDOC_Column):

/* FALLTHROUGH */

case (MDOC_Tag):

if (0 == width)

width = 10;

Line 785 termp_it_pre(DECL_ARGS)

Line 814 termp_it_pre(DECL_ARGS)

switch (type) {

case (MDOC_Diag):

term_word(p, "\\ ");

/* FALLTHROUGH */

case (MDOC_Inset):

if (MDOC_BODY == node->type)

p->flags &= ~TERMP_NOSPACE;

Line 828 termp_it_pre(DECL_ARGS)

Line 854 termp_it_pre(DECL_ARGS)

case (MDOC_Enum):

/* FALLTHROUGH */

case (MDOC_Hyphen):

/* FALLTHROUGH */

if (MDOC_HEAD == node->type)

p->flags |= TERMP_NOBREAK;

else

p->flags |= TERMP_NOLPAD;

break;

case (MDOC_Hang):

if (MDOC_HEAD == node->type)

p->flags |= TERMP_NOBREAK;

else

p->flags |= TERMP_NOLPAD;

if (MDOC_HEAD == node->type)

p->flags |= TERMP_HANG;

break;

case (MDOC_Tag):

if (MDOC_HEAD == node->type)

p->flags |= TERMP_NOBREAK;

else

p->flags |= TERMP_NOLPAD;

if (MDOC_HEAD == node->type && MDOC_Tag == type)

if (NULL == node->next ||

if (MDOC_HEAD != node->type)

NULL == node->next->child)

break;

p->flags |= TERMP_NONOBREAK;

if (NULL == node->next || NULL == node->next->child)

p->flags |= TERMP_DANGLE;

break;

case (MDOC_Column):

if (MDOC_HEAD == node->type) {

Line 875 termp_it_pre(DECL_ARGS)

Line 915 termp_it_pre(DECL_ARGS)

/* FALLTHROUGH */

case (MDOC_Hyphen):

/* FALLTHROUGH */

case (MDOC_Hang):

/* FALLTHROUGH */

case (MDOC_Tag):

assert(width);

if (MDOC_HEAD == node->type)

p->rmargin = p->offset + width;

else

p->offset += width;

break;

case (MDOC_Column):

assert(width);

p->rmargin = p->offset + width;

break;

default:

Line 893 termp_it_pre(DECL_ARGS)

Line 937 termp_it_pre(DECL_ARGS)

* HEAD character (temporarily bold, in some cases).

sv = p->flags;

if (MDOC_HEAD == node->type)

switch (type) {

case (MDOC_Bullet):

p->flags |= TERMP_BOLD;

term_word(p, "\\[bu]");

p->flags &= ~TERMP_BOLD;

break;

case (MDOC_Dash):

/* FALLTHROUGH */

case (MDOC_Hyphen):

p->flags |= TERMP_BOLD;

term_word(p, "\\(hy");

p->flags &= ~TERMP_BOLD;

break;

case (MDOC_Enum):

(pair->ppair->ppair->count)++;

Line 916 termp_it_pre(DECL_ARGS)

Line 961 termp_it_pre(DECL_ARGS)

break;

}

p->flags = sv; /* Restore saved flags. */

* If we're not going to process our children, indicate so here.

Line 957 termp_it_post(DECL_ARGS)

Line 1000 termp_it_post(DECL_ARGS)

return;

type = arg_listtype(node->parent->parent->parent);

assert(-1 != type);

switch (type) {

case (MDOC_Diag):

term_word(p, "\\ ");

/* FALLTHROUGH */

case (MDOC_Item):

/* FALLTHROUGH */

Line 1043 termp_pp_pre(DECL_ARGS)

Line 1088 termp_pp_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp_st_pre(DECL_ARGS)

{

const char *cp;

if (node->child && (cp = mdoc_a2st(node->child->string)))

term_word(p, cp);

return(0);

}

/* ARGSUSED */

static int

termp_rs_pre(DECL_ARGS)

{

Line 1070 termp_rv_pre(DECL_ARGS)

Line 1103 termp_rv_pre(DECL_ARGS)

{

int i;

/* FIXME: mandated by parser. */

i = arg_getattr(MDOC_Std, node);

assert(-1 != i);

assert(node->args->argv[i].sz);

if (-1 == (i = arg_getattr(MDOC_Std, node)))

errx(1, "expected -std argument");

if (1 != node->args->argv[i].sz)

errx(1, "expected -std argument");

term_newln(p);

term_word(p, "The");

Line 1105 termp_ex_pre(DECL_ARGS)

Line 1135 termp_ex_pre(DECL_ARGS)

{

int i;

/* FIXME: mandated by parser? */

i = arg_getattr(MDOC_Std, node);

assert(-1 != i);

assert(node->args->argv[i].sz);

if (-1 == (i = arg_getattr(MDOC_Std, node)))

errx(1, "expected -std argument");

if (1 != node->args->argv[i].sz)

errx(1, "expected -std argument");

term_word(p, "The");

p->flags |= ttypes[TTYPE_PROG];

term_word(p, *node->args->argv[i].value);

Line 1130 termp_nd_pre(DECL_ARGS)

Line 1157 termp_nd_pre(DECL_ARGS)

if (MDOC_BODY != node->type)

return(1);

* XXX: signed off by jmc@openbsd.org. This technically

* produces a minus sign after the Nd, which is wrong, but is

* consistent with the historic OpenBSD tmac file.

#if defined(__OpenBSD__) || defined(__linux__)

term_word(p, "\\-");

term_word(p, "\\(en");

#else

term_word(p, "\\(em");

#endif

Line 1304 termp_bt_pre(DECL_ARGS)

Line 1326 termp_bt_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp_lb_pre(DECL_ARGS)

{

const char *lb;

assert(node->child && MDOC_TEXT == node->child->type);

lb = mdoc_a2lib(node->child->string);

if (lb) {

term_word(p, lb);

return(0);

}

term_word(p, "library");

return(1);

}

/* ARGSUSED */

static void

termp_lb_post(DECL_ARGS)

{

Line 1571 termp_bd_pre(DECL_ARGS)

Line 1576 termp_bd_pre(DECL_ARGS)

* Ew.

p->flags |= TERMP_LITERAL;

ln = node->child ? node->child->line : 0;

for (node = node->child; node; node = node->next) {

Line 1594 termp_bd_post(DECL_ARGS)

Line 1598 termp_bd_post(DECL_ARGS)

if (MDOC_BODY != node->type)

return;

term_flushln(p);

p->flags &= ~TERMP_LITERAL;

p->flags |= TERMP_NOSPACE;

}

Line 1824 static void

Line 1825 static void

termp_in_post(DECL_ARGS)

{

p->flags |= TERMP_NOSPACE;

p->flags |= TERMP_NOSPACE | ttypes[TTYPE_INCLUDE];

term_word(p, ">");

p->flags &= ~ttypes[TTYPE_INCLUDE];

if (SEC_SYNOPSIS != node->sec)

return;

Line 1844 termp_in_post(DECL_ARGS)

Line 1846 termp_in_post(DECL_ARGS)

/* ARGSUSED */

static int

termp_at_pre(DECL_ARGS)

termp_sp_pre(DECL_ARGS)

{

const char *att;

int i, len;

att = NULL;

if (NULL == node->child) {

term_vspace(p);

return(0);

}

if (node->child)

len = atoi(node->child->string);

att = mdoc_a2att(node->child->string);

if (0 == len)

if (NULL == att)

term_newln(p);

att = "AT&T UNIX";

for (i = 0; i < len; i++)

term_vspace(p);

term_word(p, att);

return(0);

}

/* ARGSUSED */

static int

termp_br_pre(DECL_ARGS)

{

term_newln(p);

return(1);

}

/* ARGSUSED */

static int

termp_brq_pre(DECL_ARGS)

{

Line 1941 termp_fo_pre(DECL_ARGS)

Line 1956 termp_fo_pre(DECL_ARGS)

const struct mdoc_node *n;

if (MDOC_BODY == node->type) {

p->flags |= TERMP_NOSPACE;

term_word(p, "(");

p->flags |= TERMP_NOSPACE;

return(1);

} else if (MDOC_HEAD != node->type)

return(1);

/* XXX - groff shows only first parameter */

p->flags |= ttypes[TTYPE_FUNC_NAME];

for (n = node->child; n; n = n->next) {

CVSweb