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.108 and 1.115

version 1.108, 2010/01/01 18:01:40

version 1.115, 2010/04/06 11:28:17

Line 37

struct termpair {

struct termpair *ppair;

int flag;

int count;

};

Line 100 static int termp_ap_pre(DECL_ARGS);

Line 99 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_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);

Line 133 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);

static int termp_vt_pre(DECL_ARGS);

static int termp_xr_pre(DECL_ARGS);

static int termp_xx_pre(DECL_ARGS);

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

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

{ termp_d1_pre, termp_d1_post }, /* Dl */

{ termp_bd_pre, termp_bd_post }, /* Bd */

{ NULL, NULL }, /* Ed */

{ NULL, termp_bl_post }, /* Bl */

{ termp_bl_pre, termp_bl_post }, /* Bl */

{ NULL, NULL }, /* El */

{ termp_it_pre, termp_it_post }, /* It */

{ NULL, NULL }, /* Ad */

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

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

{ termp_rv_pre, NULL }, /* Rv */

{ NULL, NULL }, /* St */

{ termp_under_pre, NULL }, /* Va */

{ termp_under_pre, termp_vt_post }, /* Vt */

{ termp_vt_pre, termp_vt_post }, /* Vt */

{ termp_xr_pre, NULL }, /* Xr */

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

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

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

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

{ NULL, NULL }, /* Dc */

{ termp_dq_pre, termp_dq_post }, /* Do */

{ termp_dq_pre, termp_dq_post }, /* Dq */

{ NULL, NULL }, /* Ec */

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

{ NULL, NULL }, /* Ef */

{ termp_under_pre, NULL }, /* Em */

{ NULL, NULL }, /* Eo */

Line 270 terminal_mdoc(void *arg, const struct mdoc *mdoc)

Line 271 terminal_mdoc(void *arg, const struct mdoc *mdoc)

p = (struct termp *)arg;

p->overstep = 0;

p->maxrmargin = 78;

if (NULL == p->symtab)

switch (p->enc) {

case (TERMENC_ASCII):

Line 677 termp_it_pre(DECL_ARGS)

Line 681 termp_it_pre(DECL_ARGS)

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

/* Save parent attributes. */

pair->flag = p->flags;

/* Get list width, offset, and list type from argument list. */

keys[0] = MDOC_Width;

Line 822 termp_it_pre(DECL_ARGS)

}

* Pad and break control. This is the tricker part. Lists with

* Pad and break control. This is the tricky part. These flags

* set right-margins for the head get TERMP_NOBREAK because, if

* are documented in term_flushln() in term.c. Note that we're

* they overrun the margin, they wrap to the new margin.

* going to unset all of these flags in termp_it_post() when we

* Correspondingly, the body for these types don't left-pad, as

* exit.

* the head will pad out to to the right.

switch (type) {

Line 967 termp_it_pre(DECL_ARGS)

Line 966 termp_it_pre(DECL_ARGS)

break;

case (MDOC_Enum):

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

(void)snprintf(buf, sizeof(buf), "%d.",

snprintf(buf, sizeof(buf), "%d.",

pair->ppair->ppair->count);

term_word(p, buf);

break;

Line 1010 termp_it_post(DECL_ARGS)

Line 1009 termp_it_post(DECL_ARGS)

{

int type;

if (MDOC_BODY != n->type && MDOC_HEAD != n->type)

if (MDOC_BLOCK == n->type)

return;

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

Line 1034 termp_it_post(DECL_ARGS)

Line 1033 termp_it_post(DECL_ARGS)

break;

}

p->flags = pair->flag;

* Now that our output is flushed, we can reset our tags. Since

* only `It' sets these flags, we're free to assume that nobody

* has munged them in the meanwhile.

p->flags &= ~TERMP_DANGLE;

p->flags &= ~TERMP_NOBREAK;

p->flags &= ~TERMP_TWOSPACE;

p->flags &= ~TERMP_NOLPAD;

p->flags &= ~TERMP_HANG;

}

Line 1062 termp_fl_pre(DECL_ARGS)

Line 1071 termp_fl_pre(DECL_ARGS)

term_fontpush(p, TERMFONT_BOLD);

term_word(p, "\\-");

/* A blank `Fl' should incur a subsequent space. */

if (n->child)

p->flags |= TERMP_NOSPACE;

else if (n->next && n->next->line == n->line)

p->flags |= TERMP_NOSPACE;

return(1);

}

Line 1242 termp_nd_pre(DECL_ARGS)

Line 1251 termp_nd_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp_bl_pre(DECL_ARGS)

{

return(MDOC_HEAD != n->type);

}

/* ARGSUSED */

static void

termp_bl_post(DECL_ARGS)

{

Line 1269 termp_xr_pre(DECL_ARGS)

Line 1287 termp_xr_pre(DECL_ARGS)

{

const struct mdoc_node *nn;

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

if (NULL == n->child)

return(0);

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

nn = n->child;

term_word(p, nn->string);

Line 1286 termp_xr_pre(DECL_ARGS)

Line 1307 termp_xr_pre(DECL_ARGS)

}

static int

termp_vt_pre(DECL_ARGS)

{

if (MDOC_ELEM == n->type)

return(termp_under_pre(p, pair, m, n));

else if (MDOC_HEAD == n->type)

return(0);

else if (MDOC_BLOCK == n->type)

return(1);

return(termp_under_pre(p, pair, m, n));

}

/* ARGSUSED */

static void

termp_vt_post(DECL_ARGS)

{

if (n->sec != SEC_SYNOPSIS)

if (MDOC_BLOCK != n->type)

return;

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

term_newln(p);

Line 2015 termp_sm_pre(DECL_ARGS)

Line 2051 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))

p->flags &= ~TERMP_NONOSPACE;

p->flags &= ~TERMP_NOSPACE;

else

} else

p->flags |= TERMP_NONOSPACE;

return(0);

CVSweb