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.172 and 1.186

version 1.172, 2010/07/06 10:54:05

version 1.186, 2010/09/25 15:51: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 93 static void termp_sh_post(DECL_ARGS);

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

Line 152 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 179 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 209 static const struct termact termacts[MDOC_MAX] = {

{ 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_ns_pre, NULL }, /* Ns */

{ termp_xx_pre, NULL }, /* Nx */

Line 1027 termp_nm_pre(DECL_ARGS)

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

return(0);

synopsis_pre(p, n);

if (MDOC_HEAD == n->type)

synopsis_pre(p, n->parent);

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

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_HANG;

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

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

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

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

if (NULL == n->child) {

MDOC_TEXT == n->child->type ?

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

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

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

term_len(p, 5));

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

Line 1079 termp_fl_pre(DECL_ARGS)

Line 1086 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 1621 termp_fa_pre(DECL_ARGS)

Line 1641 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 1654 termp_bd_pre(DECL_ARGS)

Line 1673 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 ||

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

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

continue;

NULL == nn->next)

term_flushln(p);

p->flags |= TERMP_NOSPACE;

}

p->tabwidth = tabwidth;

Line 1906 termp_sp_pre(DECL_ARGS)

Line 1924 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 2067 termp_sm_pre(DECL_ARGS)

Line 2090 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 2093 static void

Line 2118 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;

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

if (NULL == n->next) {

term_word(p, ".");

p->flags |= TERMP_SENTENCE;

} else

term_word(p, ",");

}

Line 2114 termp_li_pre(DECL_ARGS)

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

CVSweb