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.274 and 1.292

version 1.274, 2017/03/13 19:01:38

version 1.292, 2017/07/14 16:06:44

Line 27

#include <unistd.h>

#include "mandoc_aux.h"

#include "mandoc.h"

#include "roff.h"

#include "mdoc.h"

#include "out.h"

Line 48 struct htmlmdoc {

Line 49 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 108 static int mdoc_rs_pre(MDOC_ARGS);

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

Line 118 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 135 static const struct htmlmdoc mdocs[MDOC_MAX] = {

Line 134 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_cm_pre, NULL}, /* Cm */

Line 237 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 362 print_mdoc_node(MDOC_ARGS)

Line 360 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 393 print_mdoc_node(MDOC_ARGS)

Line 391 print_mdoc_node(MDOC_ARGS)

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 412 print_mdoc_node(MDOC_ARGS)

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

Line 477 mdoc_root_pre(MDOC_ARGS)

Line 484 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 505 mdoc_sh_pre(MDOC_ARGS)

Line 506 mdoc_sh_pre(MDOC_ARGS)

switch (n->type) {

case ROFFT_HEAD:

id = make_id(n);

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:

Line 527 mdoc_ss_pre(MDOC_ARGS)

Line 530 mdoc_ss_pre(MDOC_ARGS)

if (n->type != ROFFT_HEAD)

return 1;

id = make_id(n);

id = html_make_id(n);

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

if (id != NULL)

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

free(id);

return 1;

}

Line 536 mdoc_ss_pre(MDOC_ARGS)

Line 541 mdoc_ss_pre(MDOC_ARGS)

static int

mdoc_fl_pre(MDOC_ARGS)

{

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

char *id;

print_text(h, "\\-");

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

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

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

free(id);

print_text(h, "\\-");

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

(n->next == NULL ||

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

Line 551 mdoc_fl_pre(MDOC_ARGS)

Line 561 mdoc_fl_pre(MDOC_ARGS)

static int

mdoc_cm_pre(MDOC_ARGS)

{

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

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;

}

Line 571 mdoc_nd_pre(MDOC_ARGS)

Line 586 mdoc_nd_pre(MDOC_ARGS)

static int

mdoc_nm_pre(MDOC_ARGS)

{

struct tag *t;

int len;

switch (n->type) {

case ROFFT_HEAD:

print_otag(h, TAG_TD, "");

Line 587 mdoc_nm_pre(MDOC_ARGS)

Line 599 mdoc_nm_pre(MDOC_ARGS)

default:

break;

}

synopsis_pre(h, n);

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

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

if (n->type == ROFFT_TEXT)

len += html_strlen(n->string);

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

len = html_strlen(meta->name);

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

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

print_otag(h, TAG_COL, "");

print_tagq(h, t);

print_otag(h, TAG_TR, "");

return 1;

}

Line 716 mdoc_it_pre(MDOC_ARGS)

Line 715 mdoc_it_pre(MDOC_ARGS)

case ROFFT_HEAD:

return 0;

case ROFFT_BODY:

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

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

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

else

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

break;

default:

break;

Line 731 mdoc_it_pre(MDOC_ARGS)

Line 727 mdoc_it_pre(MDOC_ARGS)

case LIST_ohang:

switch (n->type) {

case ROFFT_HEAD:

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

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

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;

Line 753 mdoc_it_pre(MDOC_ARGS)

Line 746 mdoc_it_pre(MDOC_ARGS)

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

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

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

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

t = print_otag(h, TAG_DT, "csw+-l",

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

print_text(h, "\\ ");

print_tagq(h, t);

Line 761 mdoc_it_pre(MDOC_ARGS)

Line 754 mdoc_it_pre(MDOC_ARGS)

print_text(h, "\\ ");

print_tagq(h, t);

}

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

print_otag(h, TAG_DT, "csw+-l", cattr,

bl->norm->Bl.width);

break;

case ROFFT_BODY:

Line 781 mdoc_it_pre(MDOC_ARGS)

Line 774 mdoc_it_pre(MDOC_ARGS)

case ROFFT_HEAD:

break;

case ROFFT_BODY:

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

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

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 799 mdoc_it_pre(MDOC_ARGS)

Line 789 mdoc_it_pre(MDOC_ARGS)

static int

mdoc_bl_pre(MDOC_ARGS)

{

char cattr[21];

struct tag *t;

struct mdoc_bl *bl;

const char *cattr;

size_t i;

enum htmltag elemtype;

Line 824 mdoc_bl_pre(MDOC_ARGS)

Line 814 mdoc_bl_pre(MDOC_ARGS)

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

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

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

print_otag(h, TAG_COL, "sw+w", bl->cols[i]);

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

print_tagq(h, t);

return 0;

Line 836 mdoc_bl_pre(MDOC_ARGS)

Line 826 mdoc_bl_pre(MDOC_ARGS)

switch (bl->type) {

case LIST_bullet:

elemtype = TAG_UL;

cattr = "Bl-bullet";

(void)strlcpy(cattr, "Bl-bullet", sizeof(cattr));

break;

case LIST_dash:

case LIST_hyphen:

elemtype = TAG_UL;

cattr = "Bl-dash";

(void)strlcpy(cattr, "Bl-dash", sizeof(cattr));

break;

case LIST_item:

elemtype = TAG_UL;

cattr = "Bl-item";

(void)strlcpy(cattr, "Bl-item", sizeof(cattr));

break;

case LIST_enum:

elemtype = TAG_OL;

cattr = "Bl-enum";

(void)strlcpy(cattr, "Bl-enum", sizeof(cattr));

break;

case LIST_diag:

elemtype = TAG_DL;

cattr = "Bl-diag";

(void)strlcpy(cattr, "Bl-diag", sizeof(cattr));

break;

case LIST_hang:

elemtype = TAG_DL;

cattr = "Bl-hang";

(void)strlcpy(cattr, "Bl-hang", sizeof(cattr));

break;

case LIST_inset:

elemtype = TAG_DL;

cattr = "Bl-inset";

(void)strlcpy(cattr, "Bl-inset", sizeof(cattr));

break;

case LIST_ohang:

elemtype = TAG_DL;

cattr = "Bl-ohang";

(void)strlcpy(cattr, "Bl-ohang", sizeof(cattr));

break;

case LIST_tag:

cattr = "Bl-tag";

if (bl->offs)

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

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

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

print_otag(h, TAG_DL, "csw+l", bl->comp ?

"Bl-tag Bl-compact" : "Bl-tag", bl->width);

return 1;

case LIST_column:

elemtype = TAG_TABLE;

cattr = "Bl-column";

(void)strlcpy(cattr, "Bl-column", sizeof(cattr));

break;

default:

abort();

}

if (bl->comp)

(void)strlcat(cattr, " Bl-compact", sizeof(cattr));

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

return 1;

}

Line 925 mdoc_sx_pre(MDOC_ARGS)

Line 917 mdoc_sx_pre(MDOC_ARGS)

{

char *id;

id = make_id(n);

id = html_make_id(n);

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

free(id);

return 1;

Line 992 mdoc_bd_pre(MDOC_ARGS)

Line 984 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 1068 mdoc_cd_pre(MDOC_ARGS)

Line 1060 mdoc_cd_pre(MDOC_ARGS)

static int

mdoc_dv_pre(MDOC_ARGS)

{

print_otag(h, TAG_CODE, "cT", "Dv");

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_CODE, "cT", "Ev");

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_CODE, "cT", "Er");

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 1288 mdoc_pp_pre(MDOC_ARGS)

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

const struct roff_node *link, *descr, *punct;

struct tag *t;

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

return 0;

assert(n->type == ROFFT_TEXT);

/* Find beginning of trailing punctuation. */

punct = n->last;

while (punct != link && punct->flags & NODE_DELIMC)

punct = punct->prev;

punct = punct->next;

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

/* Link target and link text. */

descr = link->next;

if (descr == punct)

descr = link; /* no text */

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

do {

if (descr->flags & (NODE_DELIMC | NODE_DELIMO))

h->flags |= HTML_NOSPACE;

print_text(h, descr->string);

descr = descr->next;

} while (descr != punct);

print_tagq(h, t);

if (NULL == n->next)

/* Trailing punctuation. */

print_text(h, n->string);

while (punct != NULL) {

h->flags |= HTML_NOSPACE;

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

print_text(h, punct->string);

print_text(h, n->string);

punct = punct->next;

}

return 0;

}

Line 1436 mdoc_in_pre(MDOC_ARGS)

Line 1441 mdoc_in_pre(MDOC_ARGS)

static int

mdoc_ic_pre(MDOC_ARGS)

{

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

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;

}

Line 1488 mdoc_bf_pre(MDOC_ARGS)

Line 1498 mdoc_bf_pre(MDOC_ARGS)

static int

mdoc_ms_pre(MDOC_ARGS)

{

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

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 1524 mdoc_rs_pre(MDOC_ARGS)

Line 1539 mdoc_rs_pre(MDOC_ARGS)

static int

mdoc_no_pre(MDOC_ARGS)

{

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

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;

}

CVSweb