mandoc/mdoc_html.c - diff

Return to mdoc_html.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_html.c between version 1.257 and 1.286

version 1.257, 2017/01/20 21:37:56

version 1.286, 2017/05/09 14:10:01

Line 48 struct htmlmdoc {

void (*post)(MDOC_ARGS);

};

static char *make_id(const struct roff_node *);

static char *cond_id(const struct roff_node *);

static void print_mdoc_head(MDOC_ARGS);

static void print_mdoc_node(MDOC_ARGS);

static void print_mdoc_nodelist(MDOC_ARGS);

Line 70 static void mdoc_bk_post(MDOC_ARGS);

static int mdoc_bk_pre(MDOC_ARGS);

static int mdoc_bl_pre(MDOC_ARGS);

static int mdoc_cd_pre(MDOC_ARGS);

static int mdoc_cm_pre(MDOC_ARGS);

static int mdoc_d1_pre(MDOC_ARGS);

static int mdoc_dv_pre(MDOC_ARGS);

static int mdoc_fa_pre(MDOC_ARGS);

Line 107 static int mdoc_rs_pre(MDOC_ARGS);

Line 108 static int mdoc_rs_pre(MDOC_ARGS);

static int mdoc_sh_pre(MDOC_ARGS);

static int mdoc_skip_pre(MDOC_ARGS);

static int mdoc_sm_pre(MDOC_ARGS);

static int mdoc_sp_pre(MDOC_ARGS);

static int mdoc_ss_pre(MDOC_ARGS);

static int mdoc_st_pre(MDOC_ARGS);

static int mdoc_sx_pre(MDOC_ARGS);

static int mdoc_sy_pre(MDOC_ARGS);

static int mdoc_va_pre(MDOC_ARGS);

Line 116 static int mdoc_vt_pre(MDOC_ARGS);

Line 117 static int mdoc_vt_pre(MDOC_ARGS);

static int mdoc_xr_pre(MDOC_ARGS);

static int mdoc_xx_pre(MDOC_ARGS);

static const struct htmlmdoc mdocs[MDOC_MAX] = {

static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = {

{mdoc_ap_pre, NULL}, /* Ap */

{NULL, NULL}, /* Dd */

{NULL, NULL}, /* Dt */

{NULL, NULL}, /* Os */

Line 133 static const struct htmlmdoc mdocs[MDOC_MAX] = {

{mdoc_it_pre, NULL}, /* It */

{mdoc_ad_pre, NULL}, /* Ad */

{mdoc_an_pre, NULL}, /* An */

{mdoc_ap_pre, NULL}, /* Ap */

{mdoc_ar_pre, NULL}, /* Ar */

{mdoc_cd_pre, NULL}, /* Cd */

{mdoc_fl_pre, NULL}, /* Cm */

{mdoc_cm_pre, NULL}, /* Cm */

{mdoc_dv_pre, NULL}, /* Dv */

{mdoc_er_pre, NULL}, /* Er */

{mdoc_ev_pre, NULL}, /* Ev */

Line 154 static const struct htmlmdoc mdocs[MDOC_MAX] = {

Line 155 static const struct htmlmdoc mdocs[MDOC_MAX] = {

{mdoc_ft_pre, NULL}, /* Ot */

{mdoc_pa_pre, NULL}, /* Pa */

{mdoc_ex_pre, NULL}, /* Rv */

{NULL, NULL}, /* St */

{mdoc_st_pre, NULL}, /* St */

{mdoc_va_pre, NULL}, /* Va */

{mdoc_vt_pre, NULL}, /* Vt */

{mdoc_xr_pre, NULL}, /* Xr */

Line 172 static const struct htmlmdoc mdocs[MDOC_MAX] = {

Line 173 static const struct htmlmdoc mdocs[MDOC_MAX] = {

{NULL, NULL}, /* Ac */

{mdoc_quote_pre, mdoc_quote_post}, /* Ao */

{mdoc_quote_pre, mdoc_quote_post}, /* Aq */

{NULL, NULL}, /* At */

{mdoc_xx_pre, NULL}, /* At */

{NULL, NULL}, /* Bc */

{mdoc_bf_pre, NULL}, /* Bf */

{mdoc_quote_pre, mdoc_quote_post}, /* Bo */

Line 235 static const struct htmlmdoc mdocs[MDOC_MAX] = {

Line 236 static const struct htmlmdoc mdocs[MDOC_MAX] = {

{mdoc_quote_pre, mdoc_quote_post}, /* En */

{mdoc_xx_pre, NULL}, /* Dx */

{mdoc__x_pre, mdoc__x_post}, /* %Q */

{mdoc_sp_pre, NULL}, /* br */

{mdoc_sp_pre, NULL}, /* sp */

{mdoc__x_pre, mdoc__x_post}, /* %U */

{NULL, NULL}, /* Ta */

{mdoc_skip_pre, NULL}, /* ll */

};

static const struct htmlmdoc *const mdocs = __mdocs - MDOC_Dd;

Line 348 print_mdoc_node(MDOC_ARGS)

Line 347 print_mdoc_node(MDOC_ARGS)

return;

child = 1;

t = h->tags.head;

t = h->tag;

n->flags &= ~NODE_ENDED;

switch (n->type) {

Line 360 print_mdoc_node(MDOC_ARGS)

Line 359 print_mdoc_node(MDOC_ARGS)

* Make sure that if we're in a literal mode already

* (i.e., within a <PRE>) don't print the newline.

if (' ' == *n->string && NODE_LINE & n->flags)

if (*n->string == ' ' && n->flags & NODE_LINE &&

if ( ! (HTML_LITERAL & h->flags))

(h->flags & (HTML_LITERAL | HTML_NONEWLINE)) == 0)

print_otag(h, TAG_BR, "");

if (NODE_DELIMC & n->flags)

h->flags |= HTML_NOSPACE;

print_text(h, n->string);

Line 388 print_mdoc_node(MDOC_ARGS)

Line 387 print_mdoc_node(MDOC_ARGS)

if (h->tblt != NULL) {

print_tblclose(h);

t = h->tags.head;

t = h->tag;

}

assert(h->tblt == NULL);

if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))

if (n->tok < ROFF_MAX) {

roff_html_pre(h, n);

child = 0;

break;

}

assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);

if (mdocs[n->tok].pre != NULL &&

(n->end == ENDBODY_NOT || n->child != NULL))

child = (*mdocs[n->tok].pre)(meta, n, h);

break;

}

Line 410 print_mdoc_node(MDOC_ARGS)

Line 416 print_mdoc_node(MDOC_ARGS)

case ROFFT_EQN:

break;

default:

if ( ! mdocs[n->tok].post || n->flags & NODE_ENDED)

if (n->tok < ROFF_MAX ||

mdocs[n->tok].post == NULL ||

n->flags & NODE_ENDED)

break;

(*mdocs[n->tok].post)(meta, n, h);

if (n->end != ENDBODY_NOT)

n->body->flags |= NODE_ENDED;

if (n->end == ENDBODY_NOSPACE)

h->flags |= HTML_NOSPACE;

break;

}

Line 427 mdoc_root_post(MDOC_ARGS)

Line 433 mdoc_root_post(MDOC_ARGS)

struct tag *t, *tt;

t = print_otag(h, TAG_TABLE, "c", "foot");

print_otag(h, TAG_TBODY, "");

tt = print_otag(h, TAG_TR, "");

print_otag(h, TAG_TD, "c", "foot-date");

Line 458 mdoc_root_pre(MDOC_ARGS)

Line 463 mdoc_root_pre(MDOC_ARGS)

meta->title, meta->msec);

t = print_otag(h, TAG_TABLE, "c", "head");

print_otag(h, TAG_TBODY, "");

tt = print_otag(h, TAG_TR, "");

print_otag(h, TAG_TD, "c", "head-ltitle");

Line 479 mdoc_root_pre(MDOC_ARGS)

Line 483 mdoc_root_pre(MDOC_ARGS)

}

static char *

make_id(const struct roff_node *n)

cond_id(const struct roff_node *n)

{

const struct roff_node *nch;

if (n->child != NULL &&

char *buf, *cp;

n->child->type == ROFFT_TEXT &&

(n->prev == NULL ||

for (nch = n->child; nch != NULL; nch = nch->next)

(n->prev->type == ROFFT_TEXT &&

if (nch->type != ROFFT_TEXT)

strcmp(n->prev->string, "|") == 0)) &&

return NULL;

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

(n->parent->tok == MDOC_Xo &&

buf = NULL;

n->parent->parent->prev == NULL &&

deroff(&buf, n);

n->parent->parent->parent->tok == MDOC_It)))

return html_make_id(n);

/* http://www.w3.org/TR/html5/dom.html#the-id-attribute */

return NULL;

for (cp = buf; *cp != '\0'; cp++)

if (*cp == ' ')

*cp = '_';

return buf;

}

static int

Line 506 mdoc_sh_pre(MDOC_ARGS)

Line 504 mdoc_sh_pre(MDOC_ARGS)

char *id;

switch (n->type) {

case ROFFT_BLOCK:

case ROFFT_HEAD:

return 1;

id = html_make_id(n);

print_otag(h, TAG_H1, "cTi", "Sh", id);

if (id != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

free(id);

break;

case ROFFT_BODY:

if (n->sec == SEC_AUTHORS)

h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);

return 1;

break;

default:

break;

}

if ((id = make_id(n)) != NULL) {

print_otag(h, TAG_H1, "ci", "Sh", id);

free(id);

} else

print_otag(h, TAG_H1, "c", "Sh");

return 1;

}

Line 533 mdoc_ss_pre(MDOC_ARGS)

Line 529 mdoc_ss_pre(MDOC_ARGS)

if (n->type != ROFFT_HEAD)

return 1;

if ((id = make_id(n)) != NULL) {

id = html_make_id(n);

print_otag(h, TAG_H2, "ci", "Ss", id);

print_otag(h, TAG_H2, "cTi", "Ss", id);

free(id);

if (id != NULL)

} else

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_H2, "c", "Ss");

free(id);

return 1;

}

static int

mdoc_fl_pre(MDOC_ARGS)

{

print_otag(h, TAG_B, "c", "flag");

char *id;

/* `Cm' has no leading hyphen. */

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_B, "cTi", "Fl", id);

free(id);

if (MDOC_Cm == n->tok)

return 1;

print_text(h, "\\-");

if (!(n->child == NULL &&

(n->next == NULL ||

n->next->type == ROFFT_TEXT ||

Line 564 mdoc_fl_pre(MDOC_ARGS)

Line 558 mdoc_fl_pre(MDOC_ARGS)

}

static int

mdoc_cm_pre(MDOC_ARGS)

{

char *id;

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_B, "cTi", "Cm", id);

free(id);

return 1;

}

static int

mdoc_nd_pre(MDOC_ARGS)

{

if (n->type != ROFFT_BODY)

Line 572 mdoc_nd_pre(MDOC_ARGS)

Line 578 mdoc_nd_pre(MDOC_ARGS)

/* XXX: this tag in theory can contain block elements. */

print_text(h, "\\(em");

print_otag(h, TAG_SPAN, "c", "desc");

print_otag(h, TAG_SPAN, "cT", "Nd");

return 1;

}

static int

mdoc_nm_pre(MDOC_ARGS)

{

struct tag *t;

int len;

switch (n->type) {

Line 586 mdoc_nm_pre(MDOC_ARGS)

Line 593 mdoc_nm_pre(MDOC_ARGS)

print_otag(h, TAG_TD, "");

/* FALLTHROUGH */

case ROFFT_ELEM:

print_otag(h, TAG_B, "c", "name");

print_otag(h, TAG_B, "cT", "Nm");

if (n->child == NULL && meta->name != NULL)

print_text(h, meta->name);

return 1;

case ROFFT_BODY:

print_otag(h, TAG_TD, "");

Line 598 mdoc_nm_pre(MDOC_ARGS)

Line 603 mdoc_nm_pre(MDOC_ARGS)

}

synopsis_pre(h, n);

print_otag(h, TAG_TABLE, "c", "synopsis");

print_otag(h, TAG_TABLE, "c", "Nm");

for (len = 0, n = n->head->child; n; n = n->next)

if (n->type == ROFFT_TEXT)

Line 607 mdoc_nm_pre(MDOC_ARGS)

Line 612 mdoc_nm_pre(MDOC_ARGS)

if (len == 0 && meta->name != NULL)

len = html_strlen(meta->name);

print_otag(h, TAG_COL, "shw", len);

t = print_otag(h, TAG_COLGROUP, "");

/* Increase width to make even bold text fit. */

print_otag(h, TAG_COL, "shw", len + 2);

print_otag(h, TAG_COL, "");

print_otag(h, TAG_TBODY, "");

print_tagq(h, t);

print_otag(h, TAG_TR, "");

return 1;

}

Line 621 mdoc_xr_pre(MDOC_ARGS)

Line 628 mdoc_xr_pre(MDOC_ARGS)

return 0;

if (h->base_man)

print_otag(h, TAG_A, "chM", "Xr",

print_otag(h, TAG_A, "cThM", "Xr",

n->child->string, n->child->next == NULL ?

NULL : n->child->next->string);

else

print_otag(h, TAG_A, "c", "Xr");

print_otag(h, TAG_A, "cT", "Xr");

n = n->child;

print_text(h, n->string);

Line 654 mdoc_ns_pre(MDOC_ARGS)

Line 661 mdoc_ns_pre(MDOC_ARGS)

static int

mdoc_ar_pre(MDOC_ARGS)

{

print_otag(h, TAG_I, "c", "arg");

print_otag(h, TAG_VAR, "cT", "Ar");

return 1;

}

static int

mdoc_xx_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "unix");

print_otag(h, TAG_SPAN, "c", "Ux");

return 1;

}

Line 669 static int

Line 676 static int

mdoc_it_pre(MDOC_ARGS)

{

const struct roff_node *bl;

struct tag *t;

const char *cattr;

enum mdoc_list type;

bl = n->parent;

while (bl != NULL && bl->tok != MDOC_Bl)

while (bl->tok != MDOC_Bl)

bl = bl->parent;

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

Line 723 mdoc_it_pre(MDOC_ARGS)

Line 731 mdoc_it_pre(MDOC_ARGS)

case ROFFT_HEAD:

return 0;

case ROFFT_BODY:

print_otag(h, TAG_LI, "csvt", cattr,

if (bl->norm->Bl.comp)

!bl->norm->Bl.comp);

print_otag(h, TAG_LI, "csvt", cattr, 0);

else

print_otag(h, TAG_LI, "c", cattr);

break;

default:

break;

Line 734 mdoc_it_pre(MDOC_ARGS)

Line 744 mdoc_it_pre(MDOC_ARGS)

case LIST_hang:

case LIST_inset:

case LIST_ohang:

case LIST_tag:

switch (n->type) {

case ROFFT_HEAD:

print_otag(h, TAG_DT, "csvt", cattr,

if (bl->norm->Bl.comp)

!bl->norm->Bl.comp);

print_otag(h, TAG_DT, "csvt", cattr, 0);

else

print_otag(h, TAG_DT, "c", cattr);

if (type == LIST_diag)

print_otag(h, TAG_B, "c", cattr);

break;

case ROFFT_BODY:

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

print_otag(h, TAG_DD, "cswl", cattr,

bl->norm->Bl.width);

break;

default:

break;

}

break;

case LIST_tag:

switch (n->type) {

case ROFFT_HEAD:

if (h->style != NULL && !bl->norm->Bl.comp &&

(n->parent->prev == NULL ||

n->parent->prev->body == NULL ||

n->parent->prev->body->child != NULL)) {

t = print_otag(h, TAG_DT, "csWl",

cattr, bl->norm->Bl.width);

print_text(h, "\\ ");

print_tagq(h, t);

t = print_otag(h, TAG_DD, "c", cattr);

print_text(h, "\\ ");

print_tagq(h, t);

}

print_otag(h, TAG_DT, "csWl", cattr,

bl->norm->Bl.width);

break;

case ROFFT_BODY:

if (n->child == NULL) {

print_otag(h, TAG_DD, "css?", cattr,

"width", "auto");

print_text(h, "\\ ");

} else

print_otag(h, TAG_DD, "c", cattr);

else

print_otag(h, TAG_DD, "cswl", cattr,

bl->norm->Bl.width);

break;

default:

break;

Line 758 mdoc_it_pre(MDOC_ARGS)

Line 796 mdoc_it_pre(MDOC_ARGS)

case ROFFT_HEAD:

break;

case ROFFT_BODY:

print_otag(h, TAG_TD, "csvt", cattr,

if (bl->norm->Bl.comp)

!bl->norm->Bl.comp);

print_otag(h, TAG_TD, "csvt", cattr, 0);

else

print_otag(h, TAG_TD, "c", cattr);

break;

default:

print_otag(h, TAG_TR, "c", cattr);

Line 774 mdoc_it_pre(MDOC_ARGS)

Line 814 mdoc_it_pre(MDOC_ARGS)

static int

mdoc_bl_pre(MDOC_ARGS)

{

struct tag *t;

struct mdoc_bl *bl;

const char *cattr;

int i;

size_t i;

enum htmltag elemtype;

if (n->type == ROFFT_BODY) {

bl = &n->norm->Bl;

if (LIST_column == n->norm->Bl.type)

print_otag(h, TAG_TBODY, "");

switch (n->type) {

case ROFFT_BODY:

return 1;

}

if (n->type == ROFFT_HEAD) {

case ROFFT_HEAD:

if (LIST_column != n->norm->Bl.type)

if (bl->type != LIST_column || bl->ncols == 0)

return 0;

Line 795 mdoc_bl_pre(MDOC_ARGS)

Line 837 mdoc_bl_pre(MDOC_ARGS)

* screen and we want to preserve that behaviour.

for (i = 0; i < (int)n->norm->Bl.ncols - 1; i++)

t = print_otag(h, TAG_COLGROUP, "");

print_otag(h, TAG_COL, "sww", n->norm->Bl.cols[i]);

for (i = 0; i < bl->ncols - 1; i++)

print_otag(h, TAG_COL, "swW", n->norm->Bl.cols[i]);

print_otag(h, TAG_COL, "sww", bl->cols[i]);

print_otag(h, TAG_COL, "swW", bl->cols[i]);

print_tagq(h, t);

return 0;

default:

break;

}

switch (n->norm->Bl.type) {

switch (bl->type) {

case LIST_bullet:

elemtype = TAG_UL;

cattr = "Bl-bullet";

Line 837 mdoc_bl_pre(MDOC_ARGS)

Line 883 mdoc_bl_pre(MDOC_ARGS)

cattr = "Bl-ohang";

break;

case LIST_tag:

elemtype = TAG_DL;

cattr = "Bl-tag";

break;

if (bl->offs)

print_otag(h, TAG_DIV, "cswl", cattr, bl->offs);

print_otag(h, TAG_DL, "cswl", cattr, bl->width);

return 1;

case LIST_column:

elemtype = TAG_TABLE;

cattr = "Bl-column";

Line 847 mdoc_bl_pre(MDOC_ARGS)

Line 895 mdoc_bl_pre(MDOC_ARGS)

default:

abort();

}

print_otag(h, elemtype, "cswl", cattr, bl->offs);

if (n->norm->Bl.offs)

print_otag(h, elemtype, "csvtvbwl", cattr, 0, 0,

n->norm->Bl.offs);

else

print_otag(h, elemtype, "csvtvb", cattr, 0, 0);

return 1;

}

Line 866 mdoc_ex_pre(MDOC_ARGS)

Line 908 mdoc_ex_pre(MDOC_ARGS)

}

static int

mdoc_st_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "cT", "St");

return 1;

}

static int

mdoc_em_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "emph");

print_otag(h, TAG_I, "cT", "Em");

return 1;

}

Line 891 mdoc_sx_pre(MDOC_ARGS)

Line 940 mdoc_sx_pre(MDOC_ARGS)

{

char *id;

if ((id = make_id(n)) != NULL) {

id = html_make_id(n);

print_otag(h, TAG_A, "chR", "Sx", id);

print_otag(h, TAG_A, "cThR", "Sx", id);

free(id);

} else

print_otag(h, TAG_A, "c", "Sx");

return 1;

}

Line 961 mdoc_bd_pre(MDOC_ARGS)

Line 1007 mdoc_bd_pre(MDOC_ARGS)

* anyway, so don't sweat it.

switch (nn->tok) {

case ROFF_br:

case ROFF_sp:

case MDOC_Sm:

case MDOC_br:

case MDOC_sp:

case MDOC_Bl:

case MDOC_D1:

case MDOC_Dl:

Line 991 mdoc_bd_pre(MDOC_ARGS)

Line 1037 mdoc_bd_pre(MDOC_ARGS)

static int

mdoc_pa_pre(MDOC_ARGS)

{

print_otag(h, TAG_I, "c", "file");

print_otag(h, TAG_I, "cT", "Pa");

return 1;

}

static int

mdoc_ad_pre(MDOC_ARGS)

{

print_otag(h, TAG_I, "c", "addr");

print_otag(h, TAG_I, "c", "Ad");

return 1;

}

Line 1022 mdoc_an_pre(MDOC_ARGS)

Line 1068 mdoc_an_pre(MDOC_ARGS)

if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))

h->flags |= HTML_SPLIT;

print_otag(h, TAG_SPAN, "c", "author");

print_otag(h, TAG_SPAN, "cT", "An");

return 1;

}

Line 1030 static int

Line 1076 static int

mdoc_cd_pre(MDOC_ARGS)

{

synopsis_pre(h, n);

print_otag(h, TAG_B, "c", "config");

print_otag(h, TAG_B, "cT", "Cd");

return 1;

}

static int

mdoc_dv_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "define");

char *id;

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_CODE, "cTi", "Dv", id);

free(id);

return 1;

}

static int

mdoc_ev_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "env");

char *id;

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_CODE, "cTi", "Ev", id);

free(id);

return 1;

}

static int

mdoc_er_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "errno");

char *id;

id = n->sec == SEC_ERRORS &&

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

(n->parent->tok == MDOC_Bq &&

n->parent->parent->parent->tok == MDOC_It)) ?

html_make_id(n) : NULL;

if (id != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_CODE, "cTi", "Er", id);

free(id);

return 1;

}

Line 1062 mdoc_fa_pre(MDOC_ARGS)

Line 1129 mdoc_fa_pre(MDOC_ARGS)

struct tag *t;

if (n->parent->tok != MDOC_Fo) {

print_otag(h, TAG_I, "c", "farg");

print_otag(h, TAG_VAR, "cT", "Fa");

return 1;

}

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

t = print_otag(h, TAG_I, "c", "farg");

t = print_otag(h, TAG_VAR, "cT", "Fa");

print_text(h, nn->string);

print_tagq(h, t);

if (nn->next) {

Line 1098 mdoc_fd_pre(MDOC_ARGS)

Line 1165 mdoc_fd_pre(MDOC_ARGS)

assert(n->type == ROFFT_TEXT);

if (strcmp(n->string, "#include")) {

print_otag(h, TAG_B, "c", "macro");

print_otag(h, TAG_B, "cT", "Fd");

return 1;

}

print_otag(h, TAG_B, "c", "includes");

print_otag(h, TAG_B, "cT", "In");

print_text(h, n->string);

if (NULL != (n = n->next)) {

Line 1116 mdoc_fd_pre(MDOC_ARGS)

Line 1183 mdoc_fd_pre(MDOC_ARGS)

cp = strchr(buf, '\0') - 1;

if (cp >= buf && (*cp == '>' || *cp == '"'))

*cp = '\0';

t = print_otag(h, TAG_A, "chI", "link-includes", buf);

t = print_otag(h, TAG_A, "cThI", "In", buf);

free(buf);

} else

t = print_otag(h, TAG_A, "c", "link-includes");

t = print_otag(h, TAG_A, "cT", "In");

print_text(h, n->string);

print_tagq(h, t);

Line 1146 mdoc_vt_pre(MDOC_ARGS)

Line 1213 mdoc_vt_pre(MDOC_ARGS)

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

return 0;

print_otag(h, TAG_SPAN, "c", "type");

print_otag(h, TAG_VAR, "cT", "Vt");

return 1;

}

Line 1154 static int

Line 1221 static int

mdoc_ft_pre(MDOC_ARGS)

{

synopsis_pre(h, n);

print_otag(h, TAG_I, "c", "ftype");

print_otag(h, TAG_VAR, "cT", "Ft");

return 1;

}

Line 1175 mdoc_fn_pre(MDOC_ARGS)

Line 1242 mdoc_fn_pre(MDOC_ARGS)

ep = strchr(sp, ' ');

if (NULL != ep) {

t = print_otag(h, TAG_I, "c", "ftype");

t = print_otag(h, TAG_VAR, "cT", "Ft");

while (ep) {

sz = MIN((int)(ep - sp), BUFSIZ - 1);

Line 1188 mdoc_fn_pre(MDOC_ARGS)

Line 1255 mdoc_fn_pre(MDOC_ARGS)

print_tagq(h, t);

}

t = print_otag(h, TAG_B, "c", "fname");

t = print_otag(h, TAG_B, "cT", "Fn");

if (sp)

print_text(h, sp);

Line 1201 mdoc_fn_pre(MDOC_ARGS)

Line 1268 mdoc_fn_pre(MDOC_ARGS)

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

if (NODE_SYNPRETTY & n->flags)

t = print_otag(h, TAG_I, "css?", "farg",

t = print_otag(h, TAG_VAR, "cTss?", "Fa",

"white-space", "nowrap");

else

t = print_otag(h, TAG_I, "c", "farg");

t = print_otag(h, TAG_VAR, "cT", "Fa");

print_text(h, n->string);

print_tagq(h, t);

if (n->next) {

Line 1257 mdoc_pp_pre(MDOC_ARGS)

Line 1324 mdoc_pp_pre(MDOC_ARGS)

}

static int

mdoc_sp_pre(MDOC_ARGS)

{

struct roffsu su;

SCALE_VS_INIT(&su, 1);

if (MDOC_sp == n->tok) {

if (NULL != (n = n->child)) {

if ( ! a2roffsu(n->string, &su, SCALE_VS))

su.scale = 1.0;

else if (su.scale < 0.0)

su.scale = 0.0;

}

} else

su.scale = 0.0;

print_otag(h, TAG_DIV, "suh", &su);

/* So the div isn't empty: */

print_text(h, "\\~");

return 0;

}

static int

mdoc_lk_pre(MDOC_ARGS)

{

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

struct tag *t;

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

return 0;

assert(n->type == ROFFT_TEXT);

/* Link target and link text. */

t = print_otag(h, TAG_A, "cTh", "Lk", n->string);

print_otag(h, TAG_A, "ch", "link-ext", n->string);

if (n->next == NULL || n->next->flags & NODE_DELIMC)

if (NULL == n->next)

print_text(h, n->string);

for (n = n->next; n != NULL && !(n->flags & NODE_DELIMC); n = n->next)

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

print_text(h, n->string);

print_tagq(h, t);

/* Trailing punctuation. */

while (n != NULL) {

h->flags |= HTML_NOSPACE;

print_text(h, n->string);

n = n->next;

}

return 0;

}

Line 1311 mdoc_mt_pre(MDOC_ARGS)

Line 1358 mdoc_mt_pre(MDOC_ARGS)

assert(n->type == ROFFT_TEXT);

mandoc_asprintf(&cp, "mailto:%s", n->string);

t = print_otag(h, TAG_A, "ch", "link-mail", cp);

t = print_otag(h, TAG_A, "cTh", "Mt", cp);

print_text(h, n->string);

print_tagq(h, t);

free(cp);

Line 1339 mdoc_fo_pre(MDOC_ARGS)

Line 1386 mdoc_fo_pre(MDOC_ARGS)

return 0;

assert(n->child->string);

t = print_otag(h, TAG_B, "c", "fname");

t = print_otag(h, TAG_B, "cT", "Fn");

print_text(h, n->child->string);

print_tagq(h, t);

return 0;

Line 1363 mdoc_in_pre(MDOC_ARGS)

Line 1410 mdoc_in_pre(MDOC_ARGS)

struct tag *t;

synopsis_pre(h, n);

print_otag(h, TAG_B, "c", "includes");

print_otag(h, TAG_B, "cT", "In");

* The first argument of the `In' gets special treatment as

Line 1382 mdoc_in_pre(MDOC_ARGS)

Line 1429 mdoc_in_pre(MDOC_ARGS)

assert(n->type == ROFFT_TEXT);

if (h->base_includes)

t = print_otag(h, TAG_A, "chI", "link-includes",

t = print_otag(h, TAG_A, "cThI", "In", n->string);

n->string);

else

t = print_otag(h, TAG_A, "c", "link-includes");

t = print_otag(h, TAG_A, "cT", "In");

print_text(h, n->string);

print_tagq(h, t);

Line 1406 mdoc_in_pre(MDOC_ARGS)

Line 1452 mdoc_in_pre(MDOC_ARGS)

static int

mdoc_ic_pre(MDOC_ARGS)

{

print_otag(h, TAG_B, "c", "cmd");

char *id;

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_B, "cTi", "Ic", id);

free(id);

return 1;

}

static int

mdoc_va_pre(MDOC_ARGS)

{

print_otag(h, TAG_B, "c", "var");

print_otag(h, TAG_VAR, "cT", "Va");

return 1;

}

Line 1438 mdoc_bf_pre(MDOC_ARGS)

Line 1489 mdoc_bf_pre(MDOC_ARGS)

return 1;

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

cattr = "emph";

cattr = "Em";

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

cattr = "symb";

cattr = "Sy";

else if (FONT_Li == n->norm->Bf.font)

cattr = "Li";

else

cattr = "none";

cattr = "No";

* We want this to be inline-formatted, but needs to be div to

Line 1458 mdoc_bf_pre(MDOC_ARGS)

Line 1509 mdoc_bf_pre(MDOC_ARGS)

static int

mdoc_ms_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "symb");

char *id;

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_B, "cTi", "Ms", id);

free(id);

return 1;

}

Line 1487 mdoc_rs_pre(MDOC_ARGS)

Line 1543 mdoc_rs_pre(MDOC_ARGS)

if (n->prev && SEC_SEE_ALSO == n->sec)

print_paragraph(h);

print_otag(h, TAG_SPAN, "c", "Rs");

print_otag(h, TAG_CITE, "cT", "Rs");

return 1;

}

static int

mdoc_no_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "none");

char *id;

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_SPAN, "ci", "No", id);

free(id);

return 1;

}

static int

mdoc_li_pre(MDOC_ARGS)

{

print_otag(h, TAG_CODE, "c", "Li");

char *id;

if ((id = cond_id(n)) != NULL)

print_otag(h, TAG_A, "chR", "selflink", id);

print_otag(h, TAG_CODE, "ci", "Li", id);

free(id);

return 1;

}

static int

mdoc_sy_pre(MDOC_ARGS)

{

print_otag(h, TAG_SPAN, "c", "symb");

print_otag(h, TAG_B, "cT", "Sy");

return 1;

}

Line 1518 mdoc_lb_pre(MDOC_ARGS)

Line 1584 mdoc_lb_pre(MDOC_ARGS)

if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)

print_otag(h, TAG_BR, "");

print_otag(h, TAG_SPAN, "c", "lib");

print_otag(h, TAG_SPAN, "cT", "Lb");

return 1;

}

Line 1657 mdoc_quote_pre(MDOC_ARGS)

Line 1723 mdoc_quote_pre(MDOC_ARGS)

case MDOC_Op:

print_text(h, "\\(lB");

h->flags |= HTML_NOSPACE;

print_otag(h, TAG_SPAN, "c", "opt");

print_otag(h, TAG_SPAN, "c", "Op");

break;

case MDOC_En:

if (NULL == n->norm->Es ||

CVSweb