=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.35 retrieving revision 1.39 diff -u -p -r1.35 -r1.39 --- mandoc/html.c 2009/09/20 11:05:22 1.35 +++ mandoc/html.c 2009/09/20 19:25:06 1.39 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.35 2009/09/20 11:05:22 kristaps Exp $ */ +/* $Id: html.c,v 1.39 2009/09/20 19:25:06 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -127,13 +127,21 @@ struct tag { SLIST_ENTRY(tag) entry; }; +struct ord { + int pos; + const void *cookie; + SLIST_ENTRY(ord) entry; +}; + SLIST_HEAD(tagq, tag); +SLIST_HEAD(ordq, ord); struct html { int flags; #define HTML_NOSPACE (1 << 0) #define HTML_NEWLINE (1 << 1) - struct tagq stack; + struct tagq tags; + struct ordq ords; void *symtab; }; @@ -154,6 +162,7 @@ static void print_mdoc(MDOC_ARGS); static void print_mdoc_head(MDOC_ARGS); static void print_mdoc_title(MDOC_ARGS); static void print_mdoc_node(MDOC_ARGS); +static void print_mdoc_nodelist(MDOC_ARGS); static void print_man(MAN_ARGS); static void print_man_head(MAN_ARGS); static void print_man_body(MAN_ARGS); @@ -170,16 +179,20 @@ static void print_spec(struct html *, const char *, static int a2width(const char *); static int a2offs(const char *); +static int a2list(const struct mdoc_node *); -static int mdoc_list_pre(MDOC_ARGS, int); -static int mdoc_listitem_pre(MDOC_ARGS); +static void mdoc_root_post(MDOC_ARGS); static int mdoc_root_pre(MDOC_ARGS); static int mdoc_tbl_pre(MDOC_ARGS, int); -static int mdoc_tbl_block_pre(MDOC_ARGS, int, int, int); +static int mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int); static int mdoc_tbl_body_pre(MDOC_ARGS, int, int); static int mdoc_tbl_head_pre(MDOC_ARGS, int, int); +static void mdoc_aq_post(MDOC_ARGS); +static int mdoc_aq_pre(MDOC_ARGS); static int mdoc_ar_pre(MDOC_ARGS); +static int mdoc_bd_pre(MDOC_ARGS); +static void mdoc_bl_post(MDOC_ARGS); static int mdoc_bl_pre(MDOC_ARGS); static int mdoc_d1_pre(MDOC_ARGS); static void mdoc_dq_post(MDOC_ARGS); @@ -193,9 +206,12 @@ static int mdoc_nm_pre(MDOC_ARGS); static int mdoc_ns_pre(MDOC_ARGS); static void mdoc_op_post(MDOC_ARGS); static int mdoc_op_pre(MDOC_ARGS); +static int mdoc_pa_pre(MDOC_ARGS); static int mdoc_pp_pre(MDOC_ARGS); static void mdoc_pq_post(MDOC_ARGS); static int mdoc_pq_pre(MDOC_ARGS); +static void mdoc_qq_post(MDOC_ARGS); +static int mdoc_qq_pre(MDOC_ARGS); static int mdoc_sh_pre(MDOC_ARGS); static void mdoc_sq_post(MDOC_ARGS); static int mdoc_sq_pre(MDOC_ARGS); @@ -210,7 +226,7 @@ extern size_t strlcat(char *, const char *, size_ #endif static const struct htmlmdoc mdocs[MDOC_MAX] = { - {NULL, NULL}, /* Ap */ + {mdoc_pp_pre, NULL}, /* Ap */ {NULL, NULL}, /* Dd */ {NULL, NULL}, /* Dt */ {NULL, NULL}, /* Os */ @@ -219,9 +235,9 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_pp_pre, NULL}, /* Pp */ {mdoc_d1_pre, NULL}, /* D1 */ {mdoc_d1_pre, NULL}, /* Dl */ - {NULL, NULL}, /* Bd */ + {mdoc_bd_pre, NULL}, /* Bd */ {NULL, NULL}, /* Ed */ - {mdoc_bl_pre, NULL}, /* Bl */ + {mdoc_bl_pre, mdoc_bl_post}, /* Bl */ {NULL, NULL}, /* El */ {mdoc_it_pre, NULL}, /* It */ {NULL, NULL}, /* Ad */ @@ -245,7 +261,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_nm_pre, NULL}, /* Nm */ {mdoc_op_pre, mdoc_op_post}, /* Op */ {NULL, NULL}, /* Ot */ - {NULL, NULL}, /* Pa */ + {mdoc_pa_pre, NULL}, /* Pa */ {NULL, NULL}, /* Rv */ {NULL, NULL}, /* St */ {NULL, NULL}, /* Va */ @@ -263,8 +279,8 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* %T */ {NULL, NULL}, /* %V */ {NULL, NULL}, /* Ac */ - {NULL, NULL}, /* Ao */ - {NULL, NULL}, /* Aq */ + {mdoc_aq_pre, mdoc_aq_post}, /* Ao */ + {mdoc_aq_pre, mdoc_aq_post}, /* Aq */ {NULL, NULL}, /* At */ {NULL, NULL}, /* Bc */ {NULL, NULL}, /* Bf */ @@ -292,8 +308,8 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_pq_pre, mdoc_pq_post}, /* Pq */ {NULL, NULL}, /* Qc */ {NULL, NULL}, /* Ql */ - {NULL, NULL}, /* Qo */ - {NULL, NULL}, /* Qq */ + {mdoc_qq_pre, mdoc_qq_post}, /* Qo */ + {mdoc_qq_pre, mdoc_qq_post}, /* Qq */ {NULL, NULL}, /* Re */ {NULL, NULL}, /* Rs */ {NULL, NULL}, /* Sc */ @@ -380,7 +396,9 @@ html_alloc(void) if (NULL == (h = calloc(1, sizeof(struct html)))) return(NULL); - SLIST_INIT(&h->stack); + SLIST_INIT(&h->tags); + SLIST_INIT(&h->ords); + if (NULL == (h->symtab = chars_init(CHARS_HTML))) { free(h); return(NULL); @@ -393,15 +411,25 @@ void html_free(void *p) { struct tag *tag; + struct ord *ord; struct html *h; h = (struct html *)p; - while ( ! SLIST_EMPTY(&h->stack)) { - tag = SLIST_FIRST(&h->stack); - SLIST_REMOVE_HEAD(&h->stack, entry); + while ( ! SLIST_EMPTY(&h->ords)) { + ord = SLIST_FIRST(&h->ords); + SLIST_REMOVE_HEAD(&h->ords, entry); + free(ord); + } + + while ( ! SLIST_EMPTY(&h->tags)) { + tag = SLIST_FIRST(&h->tags); + SLIST_REMOVE_HEAD(&h->tags, entry); free(tag); } + + if (h->symtab) + chars_free(h->symtab); free(h); } @@ -417,7 +445,7 @@ print_mdoc(MDOC_ARGS) t = print_otag(h, TAG_BODY, 0, NULL); print_mdoc_title(m, n, h); - print_mdoc_node(m, n, h); + print_mdoc_nodelist(m, n, h); print_tagq(h, t); } @@ -475,13 +503,23 @@ print_mdoc_title(MDOC_ARGS) static void +print_mdoc_nodelist(MDOC_ARGS) +{ + + print_mdoc_node(m, n, h); + if (n->next) + print_mdoc_nodelist(m, n->next, h); +} + + +static void print_mdoc_node(MDOC_ARGS) { int child; struct tag *t; child = 1; - t = SLIST_FIRST(&h->stack); + t = SLIST_FIRST(&h->tags); bufinit(); @@ -499,7 +537,7 @@ print_mdoc_node(MDOC_ARGS) } if (child && n->child) - print_mdoc_node(m, n->child, h); + print_mdoc_nodelist(m, n->child, h); print_stagq(h, t); @@ -507,6 +545,7 @@ print_mdoc_node(MDOC_ARGS) switch (n->type) { case (MDOC_ROOT): + mdoc_root_post(m, n, h); break; case (MDOC_TEXT): break; @@ -515,9 +554,6 @@ print_mdoc_node(MDOC_ARGS) (*mdocs[n->tok].post)(m, n, h); break; } - - if (n->next) - print_mdoc_node(m, n->next, h); } @@ -726,7 +762,7 @@ print_otag(struct html *h, enum htmltag tag, if (NULL == (t = malloc(sizeof(struct tag)))) err(EXIT_FAILURE, "malloc"); t->tag = tag; - SLIST_INSERT_HEAD(&h->stack, t, entry); + SLIST_INSERT_HEAD(&h->tags, t, entry); } else t = NULL; @@ -835,10 +871,10 @@ print_tagq(struct html *h, const struct tag *until) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->stack)) { - tag = SLIST_FIRST(&h->stack); + while ( ! SLIST_EMPTY(&h->tags)) { + tag = SLIST_FIRST(&h->tags); print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->stack, entry); + SLIST_REMOVE_HEAD(&h->tags, entry); free(tag); if (until && tag == until) return; @@ -851,12 +887,12 @@ print_stagq(struct html *h, const struct tag *suntil) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->stack)) { - tag = SLIST_FIRST(&h->stack); + while ( ! SLIST_EMPTY(&h->tags)) { + tag = SLIST_FIRST(&h->tags); if (suntil && tag == suntil) return; print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->stack, entry); + SLIST_REMOVE_HEAD(&h->tags, entry); free(tag); } } @@ -892,6 +928,48 @@ a2offs(const char *p) /* FIXME: put in utility file for front-ends. */ static int +a2list(const struct mdoc_node *bl) +{ + int i; + + assert(MDOC_BLOCK == bl->type && MDOC_Bl == bl->tok); + assert(bl->args); + + for (i = 0; i < (int)bl->args->argc; i++) + switch (bl->args->argv[i].arg) { + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Tag): + /* FALLTHROUGH */ + case (MDOC_Hang): + /* FALLTHROUGH */ + case (MDOC_Inset): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Column): + /* FALLTHROUGH */ + case (MDOC_Ohang): + return(bl->args->argv[i].arg); + default: + break; + } + + abort(); + /* NOTREACHED */ +} + + +/* FIXME: put in utility file for front-ends. */ +static int a2width(const char *p) { int i, len; @@ -910,18 +988,116 @@ a2width(const char *p) } +/* FIXME: parts should be in a utility file for front-ends. */ +/* ARGSUSED */ +static void +mdoc_root_post(MDOC_ARGS) +{ + struct tm *tm; + struct htmlpair tag[2]; + struct tag *t; + char b[BUFSIZ], os[BUFSIZ]; + tm = localtime(&m->date); + if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", tm)) + err(EXIT_FAILURE, "strftime"); + + (void)strlcpy(os, m->os, BUFSIZ); + + tag[0].key = ATTR_STYLE; + tag[0].val = "width: 100%; margin-top: 1em;"; + tag[1].key = ATTR_CLASS; + tag[1].val = "foot"; + + t = print_otag(h, TAG_DIV, 2, tag); + + bufinit(); + bufcat("width: 50%;"); + bufcat("text-align: left;"); + bufcat("float: left;"); + tag[0].key = ATTR_STYLE; + tag[0].val = buf; + print_otag(h, TAG_SPAN, 1, tag); + print_text(h, b); + print_stagq(h, t); + + bufinit(); + bufcat("width: 50%;"); + bufcat("text-align: right;"); + bufcat("float: left;"); + tag[0].key = ATTR_STYLE; + tag[0].val = buf; + print_otag(h, TAG_SPAN, 1, tag); + print_text(h, os); + print_tagq(h, t); + +} + + +/* FIXME: parts should be in a utility file for front-ends. */ /* ARGSUSED */ static int mdoc_root_pre(MDOC_ARGS) { - struct htmlpair tag; + struct htmlpair tag[2]; + struct tag *t, *tt; + char b[BUFSIZ], title[BUFSIZ]; - tag.key = ATTR_CLASS; - tag.val = "body"; + assert(m->vol); + (void)strlcpy(b, m->vol, BUFSIZ); - print_otag(h, TAG_DIV, 1, &tag); + if (m->arch) { + (void)strlcat(b, " (", BUFSIZ); + (void)strlcat(b, m->arch, BUFSIZ); + (void)strlcat(b, ")", BUFSIZ); + } + + (void)snprintf(title, BUFSIZ - 1, "%s(%d)", m->title, m->msec); + + tag[0].key = ATTR_CLASS; + tag[0].val = "body"; + + t = print_otag(h, TAG_DIV, 1, tag); + + tag[0].key = ATTR_CLASS; + tag[0].val = "head"; + tag[1].key = ATTR_STYLE; + tag[1].val = "margin-bottom: 1em; clear: both;"; + + tt = print_otag(h, TAG_DIV, 2, tag); + + bufinit(); + bufcat("width: 30%;"); + bufcat("text-align: left;"); + bufcat("float: left;"); + tag[0].key = ATTR_STYLE; + tag[0].val = buf; + print_otag(h, TAG_SPAN, 1, tag); + print_text(h, b); + print_stagq(h, tt); + + bufinit(); + bufcat("width: 30%;"); + bufcat("text-align: center;"); + bufcat("float: left;"); + tag[0].key = ATTR_STYLE; + tag[0].val = buf; + print_otag(h, TAG_SPAN, 1, tag); + print_text(h, title); + print_stagq(h, tt); + + bufinit(); + bufcat("width: 30%;"); + bufcat("text-align: right;"); + bufcat("float: left;"); + tag[0].key = ATTR_STYLE; + tag[0].val = buf; + print_otag(h, TAG_SPAN, 1, tag); + print_text(h, b); + + print_stagq(h, t); + return(1); } @@ -941,15 +1117,21 @@ mdoc_sh_pre(MDOC_ARGS) } else if (MDOC_BLOCK == n->type) { tag[0].key = ATTR_CLASS; tag[0].val = "sec-block"; - print_otag(h, TAG_DIV, 1, tag); + + if (n->prev && NULL == n->prev->body->child) { + print_otag(h, TAG_DIV, 1, tag); + return(1); + } + + tag[1].key = ATTR_STYLE; + tag[1].val = "margin-top: 1em;"; + + print_otag(h, TAG_DIV, 2, tag); return(1); } buffmt("margin-left: %dem;", INDENT); - if (n->parent->next && n->child) - bufcat("margin-bottom: 1em;"); - tag[0].key = ATTR_CLASS; tag[0].val = "sec-body"; tag[1].key = ATTR_STYLE; @@ -1202,13 +1384,24 @@ mdoc_xx_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_tbl_block_pre(MDOC_ARGS, int w, int o, int c) +mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c) { struct htmlpair tag; - buffmt("margin-left: %dem; clear: both;", w + o); + switch (t) { + case (MDOC_Column): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Ohang): + buffmt("margin-left: %dem; clear: both;", o); + break; + default: + buffmt("margin-left: %dem; clear: both;", w + o); + break; + } - if ( ! c) + if ( ! c && n->prev && n->prev->body->child) bufcat("padding-top: 1em;"); tag.key = ATTR_STYLE; @@ -1222,24 +1415,8 @@ mdoc_tbl_block_pre(MDOC_ARGS, int w, int o, int c) static int mdoc_tbl_body_pre(MDOC_ARGS, int t, int w) { - struct htmlpair tag; - int i; - switch (t) { - case (MDOC_Tag): - i = 1; - tag.key = ATTR_STYLE; - tag.val = buf; - bufcat("clear: right;"); - bufcat("float: left;"); - bufcat("width: 100%%;"); - break; - default: - i = 0; - break; - } - - print_otag(h, TAG_DIV, i, &tag); + print_otag(h, TAG_DIV, 0, NULL); return(1); } @@ -1249,26 +1426,61 @@ static int mdoc_tbl_head_pre(MDOC_ARGS, int t, int w) { struct htmlpair tag; - int i; + struct ord *ord; + char nbuf[BUFSIZ]; switch (t) { - case (MDOC_Hang): + case (MDOC_Item): /* FALLTHROUGH */ - case (MDOC_Tag): - i = 1; + case (MDOC_Ohang): + print_otag(h, TAG_DIV, 0, NULL); + break; + case (MDOC_Column): + buffmt("min-width: %dem;", w); + bufcat("clear: none;"); + if (n->next && MDOC_HEAD == n->next->type) + bufcat("float: left;"); tag.key = ATTR_STYLE; tag.val = buf; + print_otag(h, TAG_DIV, 1, &tag); + break; + default: buffmt("margin-left: -%dem;", w); bufcat("clear: left;"); bufcat("float: left;"); bufcat("padding-right: 1em;"); + tag.key = ATTR_STYLE; + tag.val = buf; + print_otag(h, TAG_DIV, 1, &tag); break; + } + + switch (t) { + case (MDOC_Diag): + tag.key = ATTR_CLASS; + tag.val = "diag"; + print_otag(h, TAG_SPAN, 1, &tag); + break; + case (MDOC_Enum): + ord = SLIST_FIRST(&h->ords); + assert(ord); + nbuf[BUFSIZ - 1] = 0; + (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++); + print_text(h, nbuf); + return(0); + case (MDOC_Dash): + print_text(h, "\\(en"); + return(0); + case (MDOC_Hyphen): + print_text(h, "\\-"); + return(0); + case (MDOC_Bullet): + print_text(h, "\\(bu"); + return(0); default: - i = 0; break; } - print_otag(h, TAG_DIV, i, &tag); return(1); } @@ -1276,8 +1488,8 @@ mdoc_tbl_head_pre(MDOC_ARGS, int t, int w) static int mdoc_tbl_pre(MDOC_ARGS, int type) { - int i, w, o, c; - const struct mdoc_node *bl; + int i, w, o, c, wp; + const struct mdoc_node *bl, *nn; bl = n->parent->parent; if (MDOC_BLOCK != n->type) @@ -1288,20 +1500,51 @@ mdoc_tbl_pre(MDOC_ARGS, int type) assert(bl->args); w = o = c = 0; + wp = -1; for (i = 0; i < (int)bl->args->argc; i++) if (MDOC_Width == bl->args->argv[i].arg) { assert(bl->args->argv[i].sz); + wp = i; w = a2width(bl->args->argv[i].value[0]); } else if (MDOC_Offset == bl->args->argv[i].arg) { assert(bl->args->argv[i].sz); o = a2offs(bl->args->argv[i].value[0]); } else if (MDOC_Compact == bl->args->argv[i].arg) c = 1; - - if (0 == w) - w = 10; + if (MDOC_HEAD == n->type && MDOC_Column == type) { + nn = n->parent->child; + assert(nn && MDOC_HEAD == nn->type); + for (i = 0; nn && nn != n; nn = nn->next, i++) + /* Counter... */ ; + assert(nn); + if (wp >= 0 && i < (int)bl->args[wp].argv->sz) + w = a2width(bl->args->argv[wp].value[i]); + } + + switch (type) { + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Bullet): + if (w < 4) + w = 4; + break; + case (MDOC_Inset): + /* FALLTHROUGH */ + case (MDOC_Diag): + w = 1; + break; + default: + if (0 == w) + w = 10; + break; + } + switch (n->type) { case (MDOC_BLOCK): break; @@ -1314,164 +1557,59 @@ mdoc_tbl_pre(MDOC_ARGS, int type) /* NOTREACHED */ } - return(mdoc_tbl_block_pre(m, n, h, w, o, c)); + return(mdoc_tbl_block_pre(m, n, h, type, w, o, c)); } -/* ARGSUSED */ static int -mdoc_listitem_pre(MDOC_ARGS) +mdoc_bl_pre(MDOC_ARGS) { - int i, w, o, c; - const struct mdoc_node *bl; - struct htmlpair tag; + struct ord *ord; - /* FIXME: fmt_vspace() equivalent. */ - if (MDOC_BLOCK != n->type) return(1); + if (MDOC_Enum != a2list(n)) + return(1); - bl = n->parent->parent; - assert(bl); + ord = malloc(sizeof(struct ord)); + if (NULL == ord) + err(EXIT_FAILURE, "malloc"); + ord->cookie = n; + ord->pos = 1; + SLIST_INSERT_HEAD(&h->ords, ord, entry); - w = o = c = 0; - - for (i = 0; i < (int)bl->args->argc; i++) - if (MDOC_Width == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - w = a2width(bl->args->argv[i].value[0]); - } else if (MDOC_Offset == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - o = a2offs(bl->args->argv[i].value[0]); - } else if (MDOC_Compact == bl->args->argv[i].arg) - c = 1; - - if (o && w) - buffmt("margin-left: %dem; padding-left: %dem;", o, w); - else if (w) - buffmt("padding-left: %dem;", w > 4 ? w - 4 : w); - else if (o) - buffmt("margin-left: %dem;", o); - - if ( ! c) - bufcat("padding-top: 1em;"); - - tag.key = ATTR_STYLE; - tag.val = buf; - - print_otag(h, TAG_LI, 1, &tag); return(1); } -/* ARGSUSED */ -static int -mdoc_list_pre(MDOC_ARGS, int type) +static void +mdoc_bl_post(MDOC_ARGS) { + struct ord *ord; - switch (type) { - case (MDOC_Enum): - print_otag(h, TAG_OL, 0, NULL); - break; - case (MDOC_Bullet): - print_otag(h, TAG_UL, 0, NULL); - break; - default: - break; - } - - return(1); -} - - -static int -mdoc_bl_pre(MDOC_ARGS) -{ - int i, len, type; - if (MDOC_BLOCK != n->type) - return(1); + return; + if (MDOC_Enum != a2list(n)) + return; - assert(n->args); - len = (int)n->args->argc; - - for (i = 0; i < len; i++) - switch ((type = n->args->argv[i].arg)) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Bullet): - return(mdoc_list_pre(m, n, h, type)); - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(1); - default: - break; - } - - abort(); - /* NOTREACHED */ + ord = SLIST_FIRST(&h->ords); + assert(ord); + SLIST_REMOVE_HEAD(&h->ords, entry); + free(ord); } static int mdoc_it_pre(MDOC_ARGS) { - int i, len, type; - const struct mdoc_node *bl; + int type; if (MDOC_BLOCK == n->type) - bl = n->parent->parent; + type = a2list(n->parent->parent); else - bl = n->parent->parent->parent; + type = a2list(n->parent->parent->parent); - assert(bl->args); - len = (int)bl->args->argc; - - for (i = 0; i < len; i++) - switch ((type = bl->args->argv[i].arg)) { - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Hang): - return(mdoc_tbl_pre(m, n, h, type)); - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Bullet): - return(mdoc_listitem_pre(m, n, h)); - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(0); - default: - break; - } - - abort(); - /* NOTREACHED */ + return(mdoc_tbl_pre(m, n, h, type)); } @@ -1611,7 +1749,6 @@ mdoc_d1_pre(MDOC_ARGS) return(1); buffmt("margin-left: %dem;", INDENT); - bufcat("margin-bottom: 0px;"); tag[0].key = ATTR_CLASS; tag[0].val = "lit-block"; @@ -1636,4 +1773,144 @@ mdoc_sx_pre(MDOC_ARGS) print_otag(h, TAG_A, 2, tag); return(1); +} + + +/* ARGSUSED */ +static int +mdoc_aq_pre(MDOC_ARGS) +{ + + if (MDOC_BODY != n->type) + return(1); + print_text(h, "\\(la"); + h->flags |= HTML_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +mdoc_aq_post(MDOC_ARGS) +{ + + if (MDOC_BODY != n->type) + return; + h->flags |= HTML_NOSPACE; + print_text(h, "\\(ra"); +} + + +/* ARGSUSED */ +static int +mdoc_bd_pre(MDOC_ARGS) +{ + struct htmlpair tag[2]; + int t, c, o, i; + const struct mdoc_node *bl; + + /* FIXME: fmt_vspace() shit. */ + + if (MDOC_BLOCK == n->type) + bl = n; + else if (MDOC_HEAD == n->type) + return(0); + else + bl = n->parent; + + t = o = c = 0; + + for (i = 0; i < (int)bl->args->argc; i++) + switch (bl->args->argv[i].arg) { + case (MDOC_Offset): + assert(bl->args->argv[i].sz); + o = a2offs(bl->args->argv[i].value[0]); + break; + case (MDOC_Compact): + c = 1; + break; + case (MDOC_Ragged): + /* FALLTHROUGH */ + case (MDOC_Filled): + /* FALLTHROUGH */ + case (MDOC_Unfilled): + /* FALLTHROUGH */ + case (MDOC_Literal): + t = bl->args->argv[i].arg; + break; + } + + if (MDOC_BLOCK == n->type) { + if (o) + buffmt("margin-left: %dem;", o); + bufcat("margin-top: 1em;"); + tag[0].key = ATTR_STYLE; + tag[0].val = buf; + print_otag(h, TAG_DIV, 1, tag); + return(1); + } + + switch (t) { + case (MDOC_Unfilled): + case (MDOC_Literal): + break; + default: + return(1); + } + + bufcat("white-space: pre;"); + tag[0].key = ATTR_STYLE; + tag[0].val = buf; + tag[1].key = ATTR_CLASS; + tag[1].val = "lit-block"; + + print_otag(h, TAG_DIV, 2, tag); + + for (n = n->child; n; n = n->next) { + h->flags |= HTML_NOSPACE; + print_mdoc_node(m, n, h); + if (n->next) + print_text(h, "\n"); + } + + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_pa_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + tag.key = ATTR_CLASS; + tag.val = "file"; + + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_qq_pre(MDOC_ARGS) +{ + + if (MDOC_BODY != n->type) + return(1); + print_text(h, "\\*q"); + h->flags |= HTML_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +mdoc_qq_post(MDOC_ARGS) +{ + + if (MDOC_BODY != n->type) + return; + h->flags |= HTML_NOSPACE; + print_text(h, "\\*q"); }