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.284 and 1.297

version 1.284, 2017/05/05 13:17:55

version 1.297, 2018/04/24 00:36:52

Line 27

#include <unistd.h>

#include "mandoc_aux.h"

#include "mandoc.h"

#include "roff.h"

#include "mdoc.h"

#include "out.h"

Line 49 struct htmlmdoc {

Line 50 struct htmlmdoc {

};

static char *cond_id(const struct roff_node *);

static void print_mdoc_head(MDOC_ARGS);

static void print_mdoc_head(const struct roff_meta *,

struct html *);

static void print_mdoc_node(MDOC_ARGS);

static void print_mdoc_nodelist(MDOC_ARGS);

static void synopsis_pre(struct html *,

const struct roff_node *);

static void mdoc_root_post(MDOC_ARGS);

static void mdoc_root_post(const struct roff_meta *,

static int mdoc_root_pre(MDOC_ARGS);

struct html *);

static int mdoc_root_pre(const struct roff_meta *,

struct html *);

static void mdoc__x_post(MDOC_ARGS);

static int mdoc__x_pre(MDOC_ARGS);

Line 108 static int mdoc_rs_pre(MDOC_ARGS);

Line 112 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 237 static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_D

Line 240 static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_D

{mdoc_quote_pre, mdoc_quote_post}, /* En */

{mdoc_xx_pre, NULL}, /* Dx */

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

{mdoc_sp_pre, NULL}, /* sp */

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

{NULL, NULL}, /* Ta */

};

Line 285 synopsis_pre(struct html *h, const struct roff_node *n

Line 287 synopsis_pre(struct html *h, const struct roff_node *n

void

html_mdoc(void *arg, const struct roff_man *mdoc)

{

struct html *h;

struct tag *t;

struct roff_node *n;

struct tag *t;

h = (struct html *)arg;

n = mdoc->first->child;

if ((h->oflags & HTML_FRAGMENT) == 0) {

print_gen_decls(h);

print_otag(h, TAG_HTML, "");

if (n->type == ROFFT_COMMENT)

print_gen_comment(h, n);

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

print_mdoc_head(&mdoc->meta, mdoc->first->child, h);

print_mdoc_head(&mdoc->meta, h);

print_tagq(h, t);

print_otag(h, TAG_BODY, "");

}

mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);

mdoc_root_pre(&mdoc->meta, h);

t = print_otag(h, TAG_DIV, "c", "manual-text");

print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);

print_mdoc_nodelist(&mdoc->meta, n, h);

print_tagq(h, t);

mdoc_root_post(&mdoc->meta, mdoc->first->child, h);

mdoc_root_post(&mdoc->meta, h);

print_tagq(h, NULL);

}

static void

print_mdoc_head(MDOC_ARGS)

print_mdoc_head(const struct roff_meta *meta, struct html *h)

{

char *cp;

Line 345 print_mdoc_node(MDOC_ARGS)

Line 351 print_mdoc_node(MDOC_ARGS)

int child;

struct tag *t;

if (n->flags & NODE_NOPRT)

if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)

return;

child = 1;

Line 361 print_mdoc_node(MDOC_ARGS)

Line 367 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 430 print_mdoc_node(MDOC_ARGS)

Line 436 print_mdoc_node(MDOC_ARGS)

}

static void

mdoc_root_post(MDOC_ARGS)

mdoc_root_post(const struct roff_meta *meta, struct html *h)

{

struct tag *t, *tt;

Line 447 mdoc_root_post(MDOC_ARGS)

Line 453 mdoc_root_post(MDOC_ARGS)

}

static int

mdoc_root_pre(MDOC_ARGS)

mdoc_root_pre(const struct roff_meta *meta, struct html *h)

{

struct tag *t, *tt;

char *volume, *title;

Line 510 mdoc_sh_pre(MDOC_ARGS)

Line 516 mdoc_sh_pre(MDOC_ARGS)

id = html_make_id(n);

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

if (id != NULL)

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

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

free(id);

break;

case ROFFT_BODY:

Line 534 mdoc_ss_pre(MDOC_ARGS)

Line 540 mdoc_ss_pre(MDOC_ARGS)

id = html_make_id(n);

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

if (id != NULL)

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

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

free(id);

return 1;

}

Line 545 mdoc_fl_pre(MDOC_ARGS)

Line 551 mdoc_fl_pre(MDOC_ARGS)

char *id;

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

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

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

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

free(id);

Line 565 mdoc_cm_pre(MDOC_ARGS)

Line 571 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_A, "chR", "permalink", id);

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

free(id);

return 1;

Line 587 mdoc_nd_pre(MDOC_ARGS)

Line 593 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 603 mdoc_nm_pre(MDOC_ARGS)

Line 606 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, "");

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

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

print_otag(h, TAG_COL, "");

print_tagq(h, t);

print_otag(h, TAG_TR, "");

return 1;

}

Line 733 mdoc_it_pre(MDOC_ARGS)

Line 722 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 748 mdoc_it_pre(MDOC_ARGS)

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

case ROFFT_BODY:

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

print_otag(h, TAG_DD, "csw*+l", cattr,

bl->norm->Bl.width);

break;

default:

Line 770 mdoc_it_pre(MDOC_ARGS)

Line 753 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 778 mdoc_it_pre(MDOC_ARGS)

Line 761 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 798 mdoc_it_pre(MDOC_ARGS)

Line 781 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 816 mdoc_it_pre(MDOC_ARGS)

Line 796 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 841 mdoc_bl_pre(MDOC_ARGS)

Line 821 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 853 mdoc_bl_pre(MDOC_ARGS)

Line 833 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 1009 mdoc_bd_pre(MDOC_ARGS)

Line 991 mdoc_bd_pre(MDOC_ARGS)

* anyway, so don't sweat it.

switch (nn->tok) {

case MDOC_Sm:

case ROFF_br:

case MDOC_sp:

case ROFF_sp:

case MDOC_Sm:

case MDOC_Bl:

case MDOC_D1:

case MDOC_Dl:

Line 1088 mdoc_dv_pre(MDOC_ARGS)

Line 1070 mdoc_dv_pre(MDOC_ARGS)

char *id;

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

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

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

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

free(id);

return 1;

Line 1100 mdoc_ev_pre(MDOC_ARGS)

Line 1082 mdoc_ev_pre(MDOC_ARGS)

char *id;

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

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

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

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

free(id);

return 1;

Line 1118 mdoc_er_pre(MDOC_ARGS)

Line 1100 mdoc_er_pre(MDOC_ARGS)

html_make_id(n) : NULL;

if (id != NULL)

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

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

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

free(id);

return 1;

Line 1326 mdoc_pp_pre(MDOC_ARGS)

Line 1308 mdoc_pp_pre(MDOC_ARGS)

}

static int

mdoc_sp_pre(MDOC_ARGS)

{

struct roffsu su;

SCALE_VS_INIT(&su, 1);

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;

}

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)

{

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

struct tag *t;

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

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

return 0;

/* Find beginning of trailing punctuation. */

punct = n->last;

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

punct = punct->prev;

punct = punct->next;

/* Link target and link text. */

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

descr = link->next;

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

if (descr == punct)

print_text(h, n->string);

descr = link; /* no text */

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

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

print_text(h, n->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);

/* Trailing punctuation. */

while (n != NULL) {

while (punct != NULL) {

h->flags |= HTML_NOSPACE;

print_text(h, n->string);

print_text(h, punct->string);

n = n->next;

punct = punct->next;

}

return 0;

}

Line 1479 mdoc_ic_pre(MDOC_ARGS)

Line 1451 mdoc_ic_pre(MDOC_ARGS)

char *id;

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

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

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

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

free(id);

return 1;

Line 1536 mdoc_ms_pre(MDOC_ARGS)

Line 1508 mdoc_ms_pre(MDOC_ARGS)

char *id;

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

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

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

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

free(id);

return 1;

Line 1577 mdoc_no_pre(MDOC_ARGS)

Line 1549 mdoc_no_pre(MDOC_ARGS)

char *id;

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

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

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

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

free(id);

return 1;

Line 1589 mdoc_li_pre(MDOC_ARGS)

Line 1561 mdoc_li_pre(MDOC_ARGS)

char *id;

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

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

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

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

free(id);

return 1;

CVSweb