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.161 and 1.193

version 1.161, 2010/06/27 17:53:27

version 1.193, 2010/10/10 09:59:48

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

Line 30

Line 31

#include "mandoc.h"

#include "out.h"

#include "term.h"

#include "regs.h"

#include "mdoc.h"

#include "chars.h"

#include "main.h"

Line 57 static size_t a2width(const struct termp *, const ch

static size_t a2height(const struct termp *, const char *);

static size_t a2offs(const struct termp *, const char *);

static int arg_hasattr(int, const struct mdoc_node *);

static int arg_getattr(int, const struct mdoc_node *);

static void print_bvspace(struct termp *,

const struct mdoc_node *,

const struct mdoc_node *);

Line 71 static void synopsis_pre(struct termp *,

Line 69 static void synopsis_pre(struct termp *,

static void termp____post(DECL_ARGS);

static void termp_an_post(DECL_ARGS);

static void termp_aq_post(DECL_ARGS);

static void termp_bd_post(DECL_ARGS);

static void termp_bk_post(DECL_ARGS);

static void termp_bl_post(DECL_ARGS);

static void termp_bq_post(DECL_ARGS);

static void termp_brq_post(DECL_ARGS);

static void termp_bx_post(DECL_ARGS);

static void termp_d1_post(DECL_ARGS);

static void termp_dq_post(DECL_ARGS);

static int termp_fd_pre(DECL_ARGS);

static void termp_fo_post(DECL_ARGS);

static void termp_in_post(DECL_ARGS);

static void termp_it_post(DECL_ARGS);

static void termp_lb_post(DECL_ARGS);

static void termp_op_post(DECL_ARGS);

static void termp_nm_post(DECL_ARGS);

static void termp_pf_post(DECL_ARGS);

static void termp_pq_post(DECL_ARGS);

static void termp_quote_post(DECL_ARGS);

static void termp_qq_post(DECL_ARGS);

static void termp_sh_post(DECL_ARGS);

static void termp_sq_post(DECL_ARGS);

static void termp_ss_post(DECL_ARGS);

static int termp__a_pre(DECL_ARGS);

static int termp_an_pre(DECL_ARGS);

static int termp_ap_pre(DECL_ARGS);

static int termp_aq_pre(DECL_ARGS);

static int termp_bd_pre(DECL_ARGS);

static int termp_bf_pre(DECL_ARGS);

static int termp_bk_pre(DECL_ARGS);

static int termp_bl_pre(DECL_ARGS);

static int termp_bold_pre(DECL_ARGS);

static int termp_bq_pre(DECL_ARGS);

static int termp_brq_pre(DECL_ARGS);

static int termp_bt_pre(DECL_ARGS);

static int termp_cd_pre(DECL_ARGS);

static int termp_d1_pre(DECL_ARGS);

static int termp_dq_pre(DECL_ARGS);

static int termp_ex_pre(DECL_ARGS);

static int termp_fa_pre(DECL_ARGS);

static int termp_fd_pre(DECL_ARGS);

static int termp_fl_pre(DECL_ARGS);

static int termp_fn_pre(DECL_ARGS);

static int termp_fo_pre(DECL_ARGS);

static int termp_ft_pre(DECL_ARGS);

static int termp_igndelim_pre(DECL_ARGS);

static int termp_in_pre(DECL_ARGS);

static int termp_it_pre(DECL_ARGS);

static int termp_li_pre(DECL_ARGS);

Line 120 static int termp_lk_pre(DECL_ARGS);

Line 110 static int termp_lk_pre(DECL_ARGS);

static int termp_nd_pre(DECL_ARGS);

static int termp_nm_pre(DECL_ARGS);

static int termp_ns_pre(DECL_ARGS);

static int termp_op_pre(DECL_ARGS);

static int termp_quote_pre(DECL_ARGS);

static int termp_pf_pre(DECL_ARGS);

static int termp_pq_pre(DECL_ARGS);

static int termp_qq_pre(DECL_ARGS);

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_under_pre(DECL_ARGS);

static int termp_ud_pre(DECL_ARGS);

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

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

{ termp_bl_pre, termp_bl_post }, /* Bl */

{ NULL, NULL }, /* El */

{ termp_it_pre, termp_it_post }, /* It */

{ NULL, NULL }, /* Ad */

{ termp_under_pre, NULL }, /* Ad */

{ termp_an_pre, termp_an_post }, /* An */

{ termp_under_pre, NULL }, /* Ar */

{ termp_cd_pre, NULL }, /* Cd */

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

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

{ termp_in_pre, termp_in_post }, /* In */

{ termp_li_pre, NULL }, /* Li */

{ termp_nd_pre, NULL }, /* Nd */

{ termp_nm_pre, NULL }, /* Nm */

{ termp_nm_pre, termp_nm_post }, /* Nm */

{ termp_op_pre, termp_op_post }, /* Op */

{ termp_quote_pre, termp_quote_post }, /* Op */

{ NULL, NULL }, /* Ot */

{ termp_under_pre, NULL }, /* Pa */

{ termp_rv_pre, NULL }, /* Rv */

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

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

{ termp_under_pre, NULL }, /* Va */

{ termp_vt_pre, NULL }, /* Vt */

{ termp_xr_pre, NULL }, /* Xr */

{ NULL, termp____post }, /* %A */

{ termp__a_pre, termp____post }, /* %A */

{ termp_under_pre, termp____post }, /* %B */

{ NULL, termp____post }, /* %D */

{ termp_under_pre, termp____post }, /* %I */

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

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

{ termp_under_pre, termp____post }, /* %T */

{ NULL, termp____post }, /* %V */

{ NULL, NULL }, /* Ac */

{ termp_aq_pre, termp_aq_post }, /* Ao */

{ termp_quote_pre, termp_quote_post }, /* Ao */

{ termp_aq_pre, termp_aq_post }, /* Aq */

{ termp_quote_pre, termp_quote_post }, /* Aq */

{ NULL, NULL }, /* At */

{ NULL, NULL }, /* Bc */

{ termp_bf_pre, NULL }, /* Bf */

{ termp_bq_pre, termp_bq_post }, /* Bo */

{ termp_quote_pre, termp_quote_post }, /* Bo */

{ termp_bq_pre, termp_bq_post }, /* Bq */

{ termp_quote_pre, termp_quote_post }, /* Bq */

{ termp_xx_pre, NULL }, /* Bsx */

{ NULL, termp_bx_post }, /* Bx */

{ NULL, NULL }, /* Db */

{ NULL, NULL }, /* Dc */

{ termp_dq_pre, termp_dq_post }, /* Do */

{ termp_quote_pre, termp_quote_post }, /* Do */

{ termp_dq_pre, termp_dq_post }, /* Dq */

{ termp_quote_pre, termp_quote_post }, /* Dq */

{ NULL, NULL }, /* Ec */ /* FIXME: no space */

{ NULL, NULL }, /* Ef */

{ termp_under_pre, NULL }, /* Em */

{ NULL, NULL }, /* Eo */

{ termp_xx_pre, NULL }, /* Fx */

{ termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */

{ termp_bold_pre, NULL }, /* Ms */

{ NULL, NULL }, /* No */

{ termp_igndelim_pre, NULL }, /* No */

{ termp_ns_pre, NULL }, /* Ns */

{ termp_xx_pre, NULL }, /* Nx */

{ termp_xx_pre, NULL }, /* Ox */

{ NULL, NULL }, /* Pc */

{ termp_pf_pre, termp_pf_post }, /* Pf */

{ termp_igndelim_pre, termp_pf_post }, /* Pf */

{ termp_pq_pre, termp_pq_post }, /* Po */

{ termp_quote_pre, termp_quote_post }, /* Po */

{ termp_pq_pre, termp_pq_post }, /* Pq */

{ termp_quote_pre, termp_quote_post }, /* Pq */

{ NULL, NULL }, /* Qc */

{ termp_sq_pre, termp_sq_post }, /* Ql */

{ termp_quote_pre, termp_quote_post }, /* Ql */

{ termp_qq_pre, termp_qq_post }, /* Qo */

{ termp_quote_pre, termp_quote_post }, /* Qo */

{ termp_qq_pre, termp_qq_post }, /* Qq */

{ termp_quote_pre, termp_quote_post }, /* Qq */

{ NULL, NULL }, /* Re */

{ termp_rs_pre, NULL }, /* Rs */

{ NULL, NULL }, /* Sc */

{ termp_sq_pre, termp_sq_post }, /* So */

{ termp_quote_pre, termp_quote_post }, /* So */

{ termp_sq_pre, termp_sq_post }, /* Sq */

{ termp_quote_pre, termp_quote_post }, /* Sq */

{ termp_sm_pre, NULL }, /* Sm */

{ termp_under_pre, NULL }, /* Sx */

{ termp_bold_pre, NULL }, /* Sy */

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

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

{ NULL, NULL }, /* Xo */

{ termp_fo_pre, termp_fo_post }, /* Fo */

{ NULL, NULL }, /* Fc */

{ termp_op_pre, termp_op_post }, /* Oo */

{ termp_quote_pre, termp_quote_post }, /* Oo */

{ NULL, NULL }, /* Oc */

{ termp_bk_pre, termp_bk_post }, /* Bk */

{ NULL, NULL }, /* Ek */

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

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

{ termp_sp_pre, NULL }, /* Lp */

{ termp_lk_pre, NULL }, /* Lk */

{ termp_under_pre, NULL }, /* Mt */

{ termp_brq_pre, termp_brq_post }, /* Brq */

{ termp_quote_pre, termp_quote_post }, /* Brq */

{ termp_brq_pre, termp_brq_post }, /* Bro */

{ termp_quote_pre, termp_quote_post }, /* Bro */

{ NULL, NULL }, /* Brc */

{ NULL, termp____post }, /* %C */

{ NULL, NULL }, /* Es */ /* TODO */

Line 325 print_mdoc_node(DECL_ARGS)

Line 311 print_mdoc_node(DECL_ARGS)

memset(&npair, 0, sizeof(struct termpair));

npair.ppair = pair;

if (MDOC_TEXT != n->type) {

if (MDOC_TEXT == n->type)

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

chld = (*termacts[n->tok].pre)(p, &npair, m, n);

} else

term_word(p, n->string);

else if (termacts[n->tok].pre && ENDBODY_NOT == n->end)

chld = (*termacts[n->tok].pre)(p, &npair, m, n);

* Keeps only work until the end of a line. If a keep was

* invoked in a prior line, revert it to PREKEEP.

if (TERMP_KEEP & p->flags) {

if (n->prev && n->prev->line != n->line) {

p->flags &= ~TERMP_KEEP;

p->flags |= TERMP_PREKEEP;

} else if (NULL == n->prev) {

if (n->parent && n->parent->line != n->line) {

p->flags &= ~TERMP_KEEP;

p->flags |= TERMP_PREKEEP;

}

if (chld && n->child)

print_mdoc_nodelist(p, &npair, m, n->child);

term_fontpopq(p, font);

if (MDOC_TEXT != n->type)

if (MDOC_TEXT != n->type && termacts[n->tok].post &&

if (termacts[n->tok].post)

! (MDOC_ENDED & n->flags)) {

(*termacts[n->tok].post)(p, &npair, m, n);

(void)(*termacts[n->tok].post)(p, &npair, m, n);

* Explicit end tokens not only call the post

* handler, but also tell the respective block

* that it must not call the post handler again.

if (ENDBODY_NOT != n->end)

n->pending->flags |= MDOC_ENDED;

* End of line terminating an implicit block

* while an explicit block is still open.

* Continue the explicit block without spacing.

if (ENDBODY_NOSPACE == n->end)

p->flags |= TERMP_NOSPACE;

}

if (MDOC_EOS & n->flags)

p->flags |= TERMP_SENTENCE;

Line 511 a2offs(const struct termp *p, const char *v)

Line 530 a2offs(const struct termp *p, const char *v)

* Return 1 if an argument has a particular argument value or 0 if it

* does not. See arg_getattr().

static int

arg_hasattr(int arg, const struct mdoc_node *n)

{

return(-1 != arg_getattr(arg, n));

}

* Get the index of an argument in a node's argument list or -1 if it

* does not exist.

static int

arg_getattr(int v, const struct mdoc_node *n)

{

int i;

if (NULL == n->args)

return(0);

for (i = 0; i < (int)n->args->argc; i++)

if (n->args->argv[i].arg == v)

return(i);

return(-1);

}

* Determine how much space to print out before block elements of `It'

* (and thus `Bl') and `Bd'. And then go ahead and print that space,

* too.

Line 556 print_bvspace(struct termp *p,

Line 543 print_bvspace(struct termp *p,

term_newln(p);

if (MDOC_Bd == bl->tok && bl->data.Bd.comp)

if (MDOC_Bd == bl->tok && bl->data.Bd->comp)

return;

if (MDOC_Bl == bl->tok && bl->data.Bl.comp)

if (MDOC_Bl == bl->tok && bl->data.Bl->comp)

return;

/* Do not vspace directly after Ss/Sh. */

Line 577 print_bvspace(struct termp *p,

Line 564 print_bvspace(struct termp *p,

/* A `-column' does not assert vspace within the list. */

if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type)

if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl->type)

if (n->prev && MDOC_It == n->prev->tok)

return;

/* A `-diag' without body does not vspace. */

if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type)

if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl->type)

if (n->prev && MDOC_It == n->prev->tok) {

assert(n->prev->body);

if (NULL == n->prev->body->child)

Line 596 print_bvspace(struct termp *p,

Line 583 print_bvspace(struct termp *p,

/* ARGSUSED */

static int

termp_dq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

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

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_dq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

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

}

/* ARGSUSED */

static int

termp_it_pre(DECL_ARGS)

{

const struct mdoc_node *bl, *nn;

char buf[7];

int i, col;

int i;

size_t width, offset, ncols, dcol;

enum mdoc_list type;

Line 637 termp_it_pre(DECL_ARGS)

Line 597 termp_it_pre(DECL_ARGS)

}

bl = n->parent->parent->parent;

type = bl->data.Bl.type;

assert(bl->data.Bl);

type = bl->data.Bl->type;

* First calculate width and offset. This is pretty easy unless

Line 647 termp_it_pre(DECL_ARGS)

Line 608 termp_it_pre(DECL_ARGS)

width = offset = 0;

if (bl->data.Bl.offs)

if (bl->data.Bl->offs)

offset = a2offs(p, bl->data.Bl.offs);

offset = a2offs(p, bl->data.Bl->offs);

switch (type) {

case (LIST_column):

if (MDOC_HEAD == n->type)

break;

col = arg_getattr(MDOC_Column, bl);

* Imitate groff's column handling:

* - For each earlier column, add its width.

Line 666 termp_it_pre(DECL_ARGS)

Line 625 termp_it_pre(DECL_ARGS)

* column.

* - For more than 5 columns, add only one column.

ncols = bl->args->argv[col].sz;

ncols = bl->data.Bl->ncols;

/* LINTED */

dcol = ncols < 5 ? term_len(p, 4) :

ncols == 5 ? term_len(p, 3) : term_len(p, 1);

Line 680 termp_it_pre(DECL_ARGS)

Line 640 termp_it_pre(DECL_ARGS)

nn->prev && i < (int)ncols;

nn = nn->prev, i++)

offset += dcol + a2width

(p, bl->args->argv[col].value[i]);

(p, bl->data.Bl->cols[i]);

* When exceeding the declared number of columns, leave

Line 695 termp_it_pre(DECL_ARGS)

Line 655 termp_it_pre(DECL_ARGS)

* Use the declared column widths, extended as explained

* in the preceding paragraph.

width = a2width(p, bl->args->argv[col].value[i]) + dcol;

width = a2width(p, bl->data.Bl->cols[i]) + dcol;

break;

default:

if (NULL == bl->data.Bl.width)

if (NULL == bl->data.Bl->width)

break;

Line 706 termp_it_pre(DECL_ARGS)

Line 666 termp_it_pre(DECL_ARGS)

* number for buffering single arguments. See the above

* handling for column for how this changes.

assert(bl->data.Bl.width);

assert(bl->data.Bl->width);

width = a2width(p, bl->data.Bl.width) + term_len(p, 2);

width = a2width(p, bl->data.Bl->width) + term_len(p, 2);

break;

}

Line 969 termp_it_post(DECL_ARGS)

Line 929 termp_it_post(DECL_ARGS)

if (MDOC_BLOCK == n->type)

return;

type = n->parent->parent->parent->data.Bl.type;

type = n->parent->parent->parent->data.Bl->type;

switch (type) {

case (LIST_item):

Line 1008 static int

Line 968 static int

termp_nm_pre(DECL_ARGS)

{

if (NULL == n->child && NULL == m->name)

if (MDOC_BLOCK == n->type)

return(1);

synopsis_pre(p, n);

if (MDOC_BODY == n->type) {

if (NULL == n->child)

return(0);

p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;

p->offset += term_len(p, 1) +

(NULL == n->prev->child ? term_strlen(p, m->name) :

MDOC_TEXT == n->prev->child->type ?

term_strlen(p, n->prev->child->string) :

term_len(p, 5));

return(1);

}

if (NULL == n->child && NULL == m->name)

return(0);

if (MDOC_HEAD == n->type)

synopsis_pre(p, n->parent);

if (MDOC_HEAD == n->type && n->next->child) {

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

p->rmargin = p->offset + term_len(p, 1);

if (NULL == n->child) {

p->rmargin += term_strlen(p, m->name);

} else if (MDOC_TEXT == n->child->type) {

p->rmargin += term_strlen(p, n->child->string);

if (n->child->next)

p->flags |= TERMP_HANG;

} else {

p->rmargin += term_len(p, 5);

p->flags |= TERMP_HANG;

}

term_fontpush(p, TERMFONT_BOLD);

if (NULL == n->child)

term_word(p, m->name);

Line 1021 termp_nm_pre(DECL_ARGS)

Line 1012 termp_nm_pre(DECL_ARGS)

/* ARGSUSED */

static void

termp_nm_post(DECL_ARGS)

{

if (MDOC_HEAD == n->type && n->next->child) {

term_flushln(p);

p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);

} else if (MDOC_BODY == n->type && n->child) {

term_flushln(p);

p->flags &= ~TERMP_NOLPAD;

}

/* ARGSUSED */

static int

termp_fl_pre(DECL_ARGS)

{

Line 1039 termp_fl_pre(DECL_ARGS)

Line 1045 termp_fl_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp__a_pre(DECL_ARGS)

{

if (n->prev && MDOC__A == n->prev->tok)

if (NULL == n->next || MDOC__A != n->next->tok)

term_word(p, "and");

return(1);

}

/* ARGSUSED */

static int

termp_an_pre(DECL_ARGS)

{

Line 1084 termp_an_post(DECL_ARGS)

Line 1103 termp_an_post(DECL_ARGS)

return;

}

if (arg_hasattr(MDOC_Split, n)) {

if (AUTH_split == n->data.An.auth) {

p->flags &= ~TERMP_NOSPLIT;

p->flags |= TERMP_SPLIT;

} else {

} else if (AUTH_nosplit == n->data.An.auth) {

p->flags &= ~TERMP_SPLIT;

p->flags |= TERMP_NOSPLIT;

}

Line 1229 termp_bl_post(DECL_ARGS)

Line 1248 termp_bl_post(DECL_ARGS)

/* ARGSUSED */

static void

termp_op_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

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

}

/* ARGSUSED */

static int

termp_xr_pre(DECL_ARGS)

{

Line 1257 termp_xr_pre(DECL_ARGS)

Line 1264 termp_xr_pre(DECL_ARGS)

return(0);

p->flags |= TERMP_NOSPACE;

term_word(p, "(");

p->flags |= TERMP_NOSPACE;

term_word(p, nn->string);

p->flags |= TERMP_NOSPACE;

term_word(p, ")");

return(0);

Line 1409 termp_sh_post(DECL_ARGS)

Line 1414 termp_sh_post(DECL_ARGS)

/* ARGSUSED */

static int

termp_op_pre(DECL_ARGS)

{

switch (n->type) {

case (MDOC_BODY):

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

p->flags |= TERMP_NOSPACE;

break;

default:

break;

}

return(1);

}

/* ARGSUSED */

static int

termp_bt_pre(DECL_ARGS)

{

Line 1482 termp_d1_post(DECL_ARGS)

Line 1470 termp_d1_post(DECL_ARGS)

/* ARGSUSED */

static int

termp_aq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

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

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_aq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

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

}

/* ARGSUSED */

static int

termp_ft_pre(DECL_ARGS)

{

Line 1581 termp_fa_pre(DECL_ARGS)

Line 1544 termp_fa_pre(DECL_ARGS)

static int

termp_bd_pre(DECL_ARGS)

{

size_t tabwidth;

size_t tabwidth, rm, rmax;

size_t rm, rmax;

const struct mdoc_node *nn;

if (MDOC_BLOCK == n->type) {

Line 1591 termp_bd_pre(DECL_ARGS)

Line 1553 termp_bd_pre(DECL_ARGS)

} else if (MDOC_HEAD == n->type)

return(0);

if (n->data.Bd.offs)

assert(n->data.Bd);

p->offset += a2offs(p, n->data.Bd.offs);

if (n->data.Bd->offs)

p->offset += a2offs(p, n->data.Bd->offs);

* If -ragged or -filled are specified, the block does nothing

Line 1602 termp_bd_pre(DECL_ARGS)

Line 1565 termp_bd_pre(DECL_ARGS)

* lines are allowed.

if (DISP_literal != n->data.Bd.type &&

if (DISP_literal != n->data.Bd->type &&

DISP_unfilled != n->data.Bd.type)

DISP_unfilled != n->data.Bd->type)

return(1);

tabwidth = p->tabwidth;

Line 1613 termp_bd_pre(DECL_ARGS)

Line 1576 termp_bd_pre(DECL_ARGS)

p->rmargin = p->maxrmargin = TERM_MAXMARGIN;

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

p->flags |= TERMP_NOSPACE;

print_mdoc_node(p, pair, m, nn);

if (NULL == nn->prev ||

nn->prev->line < nn->line ||

* If the printed node flushes its own line, then we

NULL == nn->next)

* needn't do it here as well. This is hacky, but the

term_flushln(p);

* notion of selective eoln whitespace is pretty dumb

* anyway, so don't sweat it.

switch (nn->tok) {

case (MDOC_Sm):

/* FALLTHROUGH */

case (MDOC_br):

/* FALLTHROUGH */

case (MDOC_sp):

/* FALLTHROUGH */

case (MDOC_Bl):

/* FALLTHROUGH */

case (MDOC_Lp):

/* FALLTHROUGH */

case (MDOC_Pp):

continue;

default:

break;

}

if (nn->next && nn->next->line == nn->line)

continue;

term_flushln(p);

p->flags |= TERMP_NOSPACE;

}

p->tabwidth = tabwidth;

Line 1640 termp_bd_post(DECL_ARGS)

Line 1624 termp_bd_post(DECL_ARGS)

rm = p->rmargin;

rmax = p->maxrmargin;

if (DISP_literal == n->data.Bd.type ||

assert(n->data.Bd);

DISP_unfilled == n->data.Bd.type)

if (DISP_literal == n->data.Bd->type ||

DISP_unfilled == n->data.Bd->type)

p->rmargin = p->maxrmargin = TERM_MAXMARGIN;

p->flags |= TERMP_NOSPACE;

Line 1653 termp_bd_post(DECL_ARGS)

Line 1638 termp_bd_post(DECL_ARGS)

/* ARGSUSED */

static int

termp_qq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\"");

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_qq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\"");

}

/* ARGSUSED */

static void

termp_bx_post(DECL_ARGS)

{

Line 1726 termp_xx_pre(DECL_ARGS)

Line 1686 termp_xx_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp_sq_pre(DECL_ARGS)

termp_igndelim_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

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

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_sq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

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

}

/* ARGSUSED */

static int

termp_pf_pre(DECL_ARGS)

{

p->flags |= TERMP_IGNDELIM;

return(1);

}

Line 1764 static void

Line 1699 static void

termp_pf_post(DECL_ARGS)

{

p->flags &= ~TERMP_IGNDELIM;

p->flags |= TERMP_NOSPACE;

}

Line 1864 termp_sp_pre(DECL_ARGS)

Line 1798 termp_sp_pre(DECL_ARGS)

len = 0;

break;

default:

assert(n->parent);

if ((NULL == n->next || NULL == n->prev) &&

(MDOC_Ss == n->parent->tok ||

MDOC_Sh == n->parent->tok))

return(0);

len = 1;

break;

}

Line 1879 termp_sp_pre(DECL_ARGS)

Line 1818 termp_sp_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp_brq_pre(DECL_ARGS)

termp_quote_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

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

p->flags |= TERMP_NOSPACE;

return(1);

}

switch (n->tok) {

case (MDOC_Ao):

/* FALLTHROUGH */

case (MDOC_Aq):

term_word(p, "<");

break;

case (MDOC_Bro):

/* FALLTHROUGH */

case (MDOC_Brq):

term_word(p, "{");

break;

case (MDOC_Oo):

/* FALLTHROUGH */

case (MDOC_Op):

/* FALLTHROUGH */

case (MDOC_Bo):

/* FALLTHROUGH */

case (MDOC_Bq):

term_word(p, "[");

break;

case (MDOC_Do):

/* FALLTHROUGH */

case (MDOC_Dq):

term_word(p, "``");

break;

case (MDOC_Po):

/* FALLTHROUGH */

case (MDOC_Pq):

term_word(p, "(");

break;

case (MDOC_Qo):

/* FALLTHROUGH */

case (MDOC_Qq):

term_word(p, "\"");

break;

case (MDOC_Ql):

/* FALLTHROUGH */

case (MDOC_So):

/* FALLTHROUGH */

case (MDOC_Sq):

term_word(p, "`");

break;

default:

abort();

/* NOTREACHED */

}

/* ARGSUSED */

static void

termp_brq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

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

}

/* ARGSUSED */

static int

termp_bq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

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

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_bq_post(DECL_ARGS)

termp_quote_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

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

}

/* ARGSUSED */

static int

termp_pq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

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

p->flags |= TERMP_NOSPACE;

return(1);

}

switch (n->tok) {

/* ARGSUSED */

case (MDOC_Ao):

static void

/* FALLTHROUGH */

termp_pq_post(DECL_ARGS)

case (MDOC_Aq):

{

term_word(p, ">");

break;

if (MDOC_BODY != n->type)

case (MDOC_Bro):

return;

/* FALLTHROUGH */

term_word(p, ")");

case (MDOC_Brq):

term_word(p, "}");

break;

case (MDOC_Oo):

/* FALLTHROUGH */

case (MDOC_Op):

/* FALLTHROUGH */

case (MDOC_Bo):

/* FALLTHROUGH */

case (MDOC_Bq):

term_word(p, "]");

break;

case (MDOC_Do):

/* FALLTHROUGH */

case (MDOC_Dq):

term_word(p, "''");

break;

case (MDOC_Po):

/* FALLTHROUGH */

case (MDOC_Pq):

term_word(p, ")");

break;

case (MDOC_Qo):

/* FALLTHROUGH */

case (MDOC_Qq):

term_word(p, "\"");

break;

case (MDOC_Ql):

/* FALLTHROUGH */

case (MDOC_So):

/* FALLTHROUGH */

case (MDOC_Sq):

term_word(p, "'");

break;

default:

abort();

/* NOTREACHED */

}

Line 1962 termp_fo_pre(DECL_ARGS)

Line 1946 termp_fo_pre(DECL_ARGS)

} else if (MDOC_BODY == n->type) {

p->flags |= TERMP_NOSPACE;

term_word(p, "(");

p->flags |= TERMP_NOSPACE;

return(1);

}

if (NULL == n->child)

return(0);

/* XXX: we drop non-initial arguments as per groff. */

assert(n->child);

assert(n->child->string);

term_fontpush(p, TERMFONT_BOLD);

term_word(p, n->child->string);

Line 1984 termp_fo_post(DECL_ARGS)

Line 1969 termp_fo_post(DECL_ARGS)

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, ")");

if (MDOC_SYNPRETTY & n->flags) {

if (MDOC_SYNPRETTY & n->flags)

p->flags |= TERMP_NOSPACE;

term_word(p, ";");

}

Line 1998 termp_fo_post(DECL_ARGS)

Line 1980 termp_fo_post(DECL_ARGS)

static int

termp_bf_pre(DECL_ARGS)

{

const struct mdoc_node *nn;

if (MDOC_HEAD == n->type)

return(0);

else if (MDOC_BLOCK != n->type)

return(1);

if (NULL == (nn = n->head->child)) {

assert(n->data.Bf);

if (arg_hasattr(MDOC_Emphasis, n))

term_fontpush(p, TERMFONT_UNDER);

else if (arg_hasattr(MDOC_Symbolic, n))

term_fontpush(p, TERMFONT_BOLD);

else

term_fontpush(p, TERMFONT_NONE);

return(1);

if (FONT_Em == n->data.Bf->font)

}

assert(MDOC_TEXT == nn->type);

if (0 == strcmp("Em", nn->string))

term_fontpush(p, TERMFONT_UNDER);

else if (0 == strcmp("Sy", nn->string))

else if (FONT_Sy == n->data.Bf->font)

term_fontpush(p, TERMFONT_BOLD);

else

term_fontpush(p, TERMFONT_NONE);

return(1);

Line 2034 termp_sm_pre(DECL_ARGS)

Line 2005 termp_sm_pre(DECL_ARGS)

{

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

if (0 == strcmp("on", n->child->string))

if (0 == strcmp("on", n->child->string)) {

if (p->col)

p->flags &= ~TERMP_NOSPACE;

p->flags &= ~TERMP_NONOSPACE;

else

} else

p->flags |= TERMP_NONOSPACE;

return(0);

Line 2049 termp_ap_pre(DECL_ARGS)

Line 2022 termp_ap_pre(DECL_ARGS)

{

p->flags |= TERMP_NOSPACE;

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

term_word(p, "'");

p->flags |= TERMP_NOSPACE;

return(1);

}

Line 2060 static void

Line 2033 static void

termp____post(DECL_ARGS)

{

* Handle lists of authors. In general, print each followed by

* a comma. Don't print the comma if there are only two

* authors.

if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)

if (NULL == n->next->next || MDOC__A != n->next->next->tok)

if (NULL == n->prev || MDOC__A != n->prev->tok)

return;

/* TODO: %U. */

p->flags |= TERMP_NOSPACE;

if (NULL == n->parent || MDOC_Rs != n->parent->tok)

term_word(p, n->next ? "," : ".");

return;

if (NULL == n->next) {

term_word(p, ".");

p->flags |= TERMP_SENTENCE;

} else

term_word(p, ",");

}

Line 2081 termp_li_pre(DECL_ARGS)

Line 2070 termp_li_pre(DECL_ARGS)

static int

termp_lk_pre(DECL_ARGS)

{

const struct mdoc_node *nn;

const struct mdoc_node *nn, *sv;

term_fontpush(p, TERMFONT_UNDER);

nn = n->child;

nn = sv = n->child;

if (NULL == nn->next)

return(1);

term_word(p, nn->string);

for (nn = nn->next; nn; nn = nn->next)

term_word(p, nn->string);

term_fontpop(p);

p->flags |= TERMP_NOSPACE;

term_word(p, ":");

term_fontpush(p, TERMFONT_BOLD);

for (nn = nn->next; nn; nn = nn->next)

term_word(p, sv->string);

term_word(p, nn->string);

term_fontpop(p);

return(0);

Line 2111 termp_bk_pre(DECL_ARGS)

Line 2101 termp_bk_pre(DECL_ARGS)

switch (n->type) {

case (MDOC_BLOCK):

return(1);

break;

case (MDOC_HEAD):

return(0);

case (MDOC_BODY):

p->flags |= TERMP_PREKEEP;

return(1);

break;

default:

abort();

/* NOTREACHED */

}

return(1);

}

CVSweb