-/* $Id: mdoc_html.c,v 1.110 2010/10/01 21:51:13 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.328 2019/03/01 10:57:18 schwarze Exp $ */
/*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <sys/types.h>
#include <string.h>
#include <unistd.h>
+#include "mandoc_aux.h"
#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"
#include "out.h"
#include "html.h"
-#include "mdoc.h"
#include "main.h"
-#define INDENT 5
-#define HALFINDENT 3
-
-#define MDOC_ARGS const struct mdoc_meta *m, \
- const struct mdoc_node *n, \
+#define MDOC_ARGS const struct roff_meta *meta, \
+ struct roff_node *n, \
struct html *h
#ifndef MIN
#define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b))
#endif
-struct htmlmdoc {
+struct mdoc_html_act {
int (*pre)(MDOC_ARGS);
void (*post)(MDOC_ARGS);
};
-static void print_mdoc(MDOC_ARGS);
-static void print_mdoc_head(MDOC_ARGS);
+static char *cond_id(const struct roff_node *);
+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 mdoc_node *);
-
-static void a2width(const char *, struct roffsu *);
-static void a2offs(const char *, struct roffsu *);
+static void synopsis_pre(struct html *,
+ const struct roff_node *);
-static void mdoc_root_post(MDOC_ARGS);
-static int mdoc_root_pre(MDOC_ARGS);
+static void mdoc_root_post(const struct roff_meta *,
+ 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);
+static int mdoc_abort_pre(MDOC_ARGS);
static int mdoc_ad_pre(MDOC_ARGS);
static int mdoc_an_pre(MDOC_ARGS);
static int mdoc_ap_pre(MDOC_ARGS);
static int mdoc_bf_pre(MDOC_ARGS);
static void mdoc_bk_post(MDOC_ARGS);
static int mdoc_bk_pre(MDOC_ARGS);
-static void mdoc_bl_post(MDOC_ARGS);
static int mdoc_bl_pre(MDOC_ARGS);
-static int mdoc_bt_pre(MDOC_ARGS);
-static int mdoc_bx_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);
static int mdoc_fn_pre(MDOC_ARGS);
static int mdoc_ft_pre(MDOC_ARGS);
static int mdoc_em_pre(MDOC_ARGS);
+static void mdoc_eo_post(MDOC_ARGS);
+static int mdoc_eo_pre(MDOC_ARGS);
static int mdoc_er_pre(MDOC_ARGS);
static int mdoc_ev_pre(MDOC_ARGS);
static int mdoc_ex_pre(MDOC_ARGS);
static int mdoc_ic_pre(MDOC_ARGS);
static int mdoc_igndelim_pre(MDOC_ARGS);
static int mdoc_in_pre(MDOC_ARGS);
-static int mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list,
- int, struct roffsu *, struct roffsu *);
-static int mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list,
- struct roffsu *);
-static int mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list,
- struct roffsu *);
static int mdoc_it_pre(MDOC_ARGS);
static int mdoc_lb_pre(MDOC_ARGS);
static int mdoc_li_pre(MDOC_ARGS);
static int mdoc_ms_pre(MDOC_ARGS);
static int mdoc_nd_pre(MDOC_ARGS);
static int mdoc_nm_pre(MDOC_ARGS);
+static int mdoc_no_pre(MDOC_ARGS);
static int mdoc_ns_pre(MDOC_ARGS);
static int mdoc_pa_pre(MDOC_ARGS);
static void mdoc_pf_post(MDOC_ARGS);
+static int mdoc_pp_pre(MDOC_ARGS);
static void mdoc_quote_post(MDOC_ARGS);
static int mdoc_quote_pre(MDOC_ARGS);
static int mdoc_rs_pre(MDOC_ARGS);
-static int mdoc_rv_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_ud_pre(MDOC_ARGS);
static int mdoc_va_pre(MDOC_ARGS);
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] = {
- {mdoc_ap_pre, NULL}, /* Ap */
+static const struct mdoc_html_act mdoc_html_acts[MDOC_MAX - MDOC_Dd] = {
{NULL, NULL}, /* Dd */
{NULL, NULL}, /* Dt */
{NULL, NULL}, /* Os */
{mdoc_sh_pre, NULL }, /* Sh */
- {mdoc_ss_pre, NULL }, /* Ss */
- {mdoc_sp_pre, NULL}, /* Pp */
+ {mdoc_ss_pre, NULL }, /* Ss */
+ {mdoc_pp_pre, NULL}, /* Pp */
{mdoc_d1_pre, NULL}, /* D1 */
{mdoc_d1_pre, NULL}, /* Dl */
{mdoc_bd_pre, NULL}, /* Bd */
{NULL, NULL}, /* Ed */
- {mdoc_bl_pre, mdoc_bl_post}, /* Bl */
+ {mdoc_bl_pre, NULL}, /* Bl */
{NULL, NULL}, /* El */
{mdoc_it_pre, NULL}, /* It */
- {mdoc_ad_pre, NULL}, /* Ad */
+ {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_dv_pre, NULL}, /* Dv */
- {mdoc_er_pre, NULL}, /* Er */
- {mdoc_ev_pre, NULL}, /* Ev */
+ {mdoc_cm_pre, NULL}, /* Cm */
+ {mdoc_dv_pre, NULL}, /* Dv */
+ {mdoc_er_pre, NULL}, /* Er */
+ {mdoc_ev_pre, NULL}, /* Ev */
{mdoc_ex_pre, NULL}, /* Ex */
- {mdoc_fa_pre, NULL}, /* Fa */
- {mdoc_fd_pre, NULL}, /* Fd */
+ {mdoc_fa_pre, NULL}, /* Fa */
+ {mdoc_fd_pre, NULL}, /* Fd */
{mdoc_fl_pre, NULL}, /* Fl */
- {mdoc_fn_pre, NULL}, /* Fn */
- {mdoc_ft_pre, NULL}, /* Ft */
- {mdoc_ic_pre, NULL}, /* Ic */
- {mdoc_in_pre, NULL}, /* In */
+ {mdoc_fn_pre, NULL}, /* Fn */
+ {mdoc_ft_pre, NULL}, /* Ft */
+ {mdoc_ic_pre, NULL}, /* Ic */
+ {mdoc_in_pre, NULL}, /* In */
{mdoc_li_pre, NULL}, /* Li */
- {mdoc_nd_pre, NULL}, /* Nd */
- {mdoc_nm_pre, NULL}, /* Nm */
+ {mdoc_nd_pre, NULL}, /* Nd */
+ {mdoc_nm_pre, NULL}, /* Nm */
{mdoc_quote_pre, mdoc_quote_post}, /* Op */
- {NULL, NULL}, /* Ot */
+ {mdoc_abort_pre, NULL}, /* Ot */
{mdoc_pa_pre, NULL}, /* Pa */
- {mdoc_rv_pre, NULL}, /* Rv */
- {NULL, NULL}, /* St */
+ {mdoc_ex_pre, NULL}, /* Rv */
+ {mdoc_st_pre, NULL}, /* St */
{mdoc_va_pre, NULL}, /* Va */
- {mdoc_vt_pre, NULL}, /* Vt */
+ {mdoc_vt_pre, NULL}, /* Vt */
{mdoc_xr_pre, NULL}, /* Xr */
{mdoc__x_pre, mdoc__x_post}, /* %A */
{mdoc__x_pre, mdoc__x_post}, /* %B */
{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_bf_pre, NULL}, /* Bf */
{mdoc_quote_pre, mdoc_quote_post}, /* Bo */
{mdoc_quote_pre, mdoc_quote_post}, /* Bq */
{mdoc_xx_pre, NULL}, /* Bsx */
- {mdoc_bx_pre, NULL}, /* Bx */
- {NULL, NULL}, /* Db */
+ {mdoc_xx_pre, NULL}, /* Bx */
+ {mdoc_skip_pre, NULL}, /* Db */
{NULL, NULL}, /* Dc */
{mdoc_quote_pre, mdoc_quote_post}, /* Do */
{mdoc_quote_pre, mdoc_quote_post}, /* Dq */
{NULL, NULL}, /* Ec */ /* FIXME: no space */
{NULL, NULL}, /* Ef */
- {mdoc_em_pre, NULL}, /* Em */
- {NULL, NULL}, /* Eo */
+ {mdoc_em_pre, NULL}, /* Em */
+ {mdoc_eo_pre, mdoc_eo_post}, /* Eo */
{mdoc_xx_pre, NULL}, /* Fx */
{mdoc_ms_pre, NULL}, /* Ms */
- {mdoc_igndelim_pre, NULL}, /* No */
+ {mdoc_no_pre, NULL}, /* No */
{mdoc_ns_pre, NULL}, /* Ns */
{mdoc_xx_pre, NULL}, /* Nx */
{mdoc_xx_pre, NULL}, /* Ox */
{NULL, NULL}, /* Sc */
{mdoc_quote_pre, mdoc_quote_post}, /* So */
{mdoc_quote_pre, mdoc_quote_post}, /* Sq */
- {mdoc_sm_pre, NULL}, /* Sm */
+ {mdoc_sm_pre, NULL}, /* Sm */
{mdoc_sx_pre, NULL}, /* Sx */
{mdoc_sy_pre, NULL}, /* Sy */
{NULL, NULL}, /* Tn */
{mdoc_xx_pre, NULL}, /* Ux */
{NULL, NULL}, /* Xc */
{NULL, NULL}, /* Xo */
- {mdoc_fo_pre, mdoc_fo_post}, /* Fo */
- {NULL, NULL}, /* Fc */
+ {mdoc_fo_pre, mdoc_fo_post}, /* Fo */
+ {NULL, NULL}, /* Fc */
{mdoc_quote_pre, mdoc_quote_post}, /* Oo */
{NULL, NULL}, /* Oc */
{mdoc_bk_pre, mdoc_bk_post}, /* Bk */
{NULL, NULL}, /* Ek */
- {mdoc_bt_pre, NULL}, /* Bt */
+ {NULL, NULL}, /* Bt */
{NULL, NULL}, /* Hf */
- {NULL, NULL}, /* Fr */
- {mdoc_ud_pre, NULL}, /* Ud */
+ {mdoc_em_pre, NULL}, /* Fr */
+ {NULL, NULL}, /* Ud */
{mdoc_lb_pre, NULL}, /* Lb */
- {mdoc_sp_pre, NULL}, /* Lp */
- {mdoc_lk_pre, NULL}, /* Lk */
- {mdoc_mt_pre, NULL}, /* Mt */
- {mdoc_quote_pre, mdoc_quote_post}, /* Brq */
- {mdoc_quote_pre, mdoc_quote_post}, /* Bro */
- {NULL, NULL}, /* Brc */
- {mdoc__x_pre, mdoc__x_post}, /* %C */
- {NULL, NULL}, /* Es */ /* TODO */
- {NULL, NULL}, /* En */ /* TODO */
- {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_abort_pre, NULL}, /* Lp */
+ {mdoc_lk_pre, NULL}, /* Lk */
+ {mdoc_mt_pre, NULL}, /* Mt */
+ {mdoc_quote_pre, mdoc_quote_post}, /* Brq */
+ {mdoc_quote_pre, mdoc_quote_post}, /* Bro */
+ {NULL, NULL}, /* Brc */
+ {mdoc__x_pre, mdoc__x_post}, /* %C */
+ {mdoc_skip_pre, NULL}, /* Es */
+ {mdoc_quote_pre, mdoc_quote_post}, /* En */
+ {mdoc_xx_pre, NULL}, /* Dx */
+ {mdoc__x_pre, mdoc__x_post}, /* %Q */
+ {mdoc__x_pre, mdoc__x_post}, /* %U */
+ {NULL, NULL}, /* Ta */
};
-void
-html_mdoc(void *arg, const struct mdoc *m)
-{
- struct html *h;
- struct tag *t;
-
- h = (struct html *)arg;
-
- print_gen_decls(h);
- t = print_otag(h, TAG_HTML, 0, NULL);
- print_mdoc(mdoc_meta(m), mdoc_node(m), h);
- print_tagq(h, t);
-
- printf("\n");
-}
-
-
-/*
- * Calculate the scaling unit passed in a `-width' argument. This uses
- * either a native scaling unit (e.g., 1i, 2m) or the string length of
- * the value.
- */
-static void
-a2width(const char *p, struct roffsu *su)
-{
-
- if ( ! a2roffsu(p, su, SCALE_MAX)) {
- su->unit = SCALE_EM;
- su->scale = (int)strlen(p);
- }
-}
-
-
/*
* See the same function in mdoc_term.c for documentation.
*/
static void
-synopsis_pre(struct html *h, const struct mdoc_node *n)
+synopsis_pre(struct html *h, const struct roff_node *n)
{
- struct roffsu su;
- struct htmlpair tag;
- if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+ if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))
return;
- SCALE_VS_INIT(&su, 1);
- bufcat_su(h, "margin-top", &su);
- PAIR_STYLE_INIT(&tag, h);
-
- if (n->prev->tok == n->tok &&
- MDOC_Fo != n->tok &&
- MDOC_Ft != n->tok &&
- MDOC_Fn != n->tok) {
- print_otag(h, TAG_DIV, 0, NULL);
+ if (n->prev->tok == n->tok &&
+ MDOC_Fo != n->tok &&
+ MDOC_Ft != n->tok &&
+ MDOC_Fn != n->tok) {
+ print_otag(h, TAG_BR, "");
return;
}
switch (n->prev->tok) {
- case (MDOC_Fd):
- /* FALLTHROUGH */
- case (MDOC_Fn):
- /* FALLTHROUGH */
- case (MDOC_Fo):
- /* FALLTHROUGH */
- case (MDOC_In):
- /* FALLTHROUGH */
- case (MDOC_Vt):
- print_otag(h, TAG_DIV, 1, &tag);
+ case MDOC_Fd:
+ case MDOC_Fn:
+ case MDOC_Fo:
+ case MDOC_In:
+ case MDOC_Vt:
break;
- case (MDOC_Ft):
- if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
- print_otag(h, TAG_DIV, 1, &tag);
+ case MDOC_Ft:
+ if (n->tok != MDOC_Fn && n->tok != MDOC_Fo)
break;
- }
/* FALLTHROUGH */
default:
- print_otag(h, TAG_DIV, 0, NULL);
- break;
+ print_otag(h, TAG_BR, "");
+ return;
}
+ html_close_paragraph(h);
+ print_otag(h, TAG_P, "c", "Pp");
}
-
-/*
- * Calculate the scaling unit passed in an `-offset' argument. This
- * uses either a native scaling unit (e.g., 1i, 2m), one of a set of
- * predefined strings (indent, etc.), or the string length of the value.
- */
-static void
-a2offs(const char *p, struct roffsu *su)
+void
+html_mdoc(void *arg, const struct roff_meta *mdoc)
{
+ struct html *h;
+ struct roff_node *n;
+ struct tag *t;
- /* FIXME: "right"? */
-
- if (0 == strcmp(p, "left"))
- SCALE_HS_INIT(su, 0);
- else if (0 == strcmp(p, "indent"))
- SCALE_HS_INIT(su, INDENT);
- else if (0 == strcmp(p, "indent-two"))
- SCALE_HS_INIT(su, INDENT * 2);
- else if ( ! a2roffsu(p, su, SCALE_MAX)) {
- su->unit = SCALE_EM;
- su->scale = (int)strlen(p);
+ 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 != NULL && n->type == ROFFT_COMMENT)
+ print_gen_comment(h, n);
+ t = print_otag(h, TAG_HEAD, "");
+ print_mdoc_head(mdoc, h);
+ print_tagq(h, t);
+ print_otag(h, TAG_BODY, "");
}
-}
-
-static void
-print_mdoc(MDOC_ARGS)
-{
- struct tag *t;
- struct htmlpair tag;
-
- t = print_otag(h, TAG_HEAD, 0, NULL);
- print_mdoc_head(m, n, h);
- print_tagq(h, t);
-
- t = print_otag(h, TAG_BODY, 0, NULL);
-
- tag.key = ATTR_CLASS;
- tag.val = "body";
- print_otag(h, TAG_DIV, 1, &tag);
-
- print_mdoc_nodelist(m, n, h);
+ mdoc_root_pre(mdoc, h);
+ t = print_otag(h, TAG_DIV, "c", "manual-text");
+ print_mdoc_nodelist(mdoc, n, h);
print_tagq(h, t);
+ mdoc_root_post(mdoc, h);
+ print_tagq(h, NULL);
}
-
-/* ARGSUSED */
static void
-print_mdoc_head(MDOC_ARGS)
+print_mdoc_head(const struct roff_meta *meta, struct html *h)
{
+ char *cp;
print_gen_head(h);
- bufinit(h);
- buffmt(h, "%s(%s)", m->title, m->msec);
- if (m->arch) {
- bufcat(h, " (");
- bufcat(h, m->arch);
- bufcat(h, ")");
- }
+ if (meta->arch != NULL && meta->msec != NULL)
+ mandoc_asprintf(&cp, "%s(%s) (%s)", meta->title,
+ meta->msec, meta->arch);
+ else if (meta->msec != NULL)
+ mandoc_asprintf(&cp, "%s(%s)", meta->title, meta->msec);
+ else if (meta->arch != NULL)
+ mandoc_asprintf(&cp, "%s (%s)", meta->title, meta->arch);
+ else
+ cp = mandoc_strdup(meta->title);
- print_otag(h, TAG_TITLE, 0, NULL);
- print_text(h, h->buf);
+ print_otag(h, TAG_TITLE, "");
+ print_text(h, cp);
+ free(cp);
}
-
static void
print_mdoc_nodelist(MDOC_ARGS)
{
- print_mdoc_node(m, n, h);
- if (n->next)
- print_mdoc_nodelist(m, n->next, h);
+ while (n != NULL) {
+ print_mdoc_node(meta, n, h);
+ n = n->next;
+ }
}
-
static void
print_mdoc_node(MDOC_ARGS)
{
- int child;
struct tag *t;
+ int child;
- child = 1;
- t = h->tags.head;
+ if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
+ return;
- bufinit(h);
+ html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
+
+ child = 1;
+ n->flags &= ~NODE_ENDED;
switch (n->type) {
- case (MDOC_ROOT):
- child = mdoc_root_pre(m, n, h);
- break;
- case (MDOC_TEXT):
+ case ROFFT_TEXT:
+ t = h->tag;
+ t->refcnt++;
+
+ /* No tables in this mode... */
+ assert(NULL == h->tblt);
+
+ /*
+ * Make sure that if we're in a literal mode already
+ * (i.e., within a <PRE>) don't print the newline.
+ */
+ if (*n->string == ' ' && n->flags & NODE_LINE &&
+ (h->flags & HTML_NONEWLINE) == 0 &&
+ (n->flags & NODE_NOFILL) == 0)
+ print_otag(h, TAG_BR, "");
+ if (NODE_DELIMC & n->flags)
+ h->flags |= HTML_NOSPACE;
print_text(h, n->string);
+ if (NODE_DELIMO & n->flags)
+ h->flags |= HTML_NOSPACE;
+ break;
+ case ROFFT_EQN:
+ t = h->tag;
+ t->refcnt++;
+ print_eqn(h, n->eqn);
+ break;
+ case ROFFT_TBL:
+ /*
+ * This will take care of initialising all of the table
+ * state data for the first table, then tearing it down
+ * for the last one.
+ */
+ print_tbl(h, n->span);
return;
default:
- if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
- child = (*mdocs[n->tok].pre)(m, n, h);
+ /*
+ * Close out the current table, if it's open, and unset
+ * the "meta" table state. This will be reopened on the
+ * next table element.
+ */
+ if (h->tblt != NULL)
+ print_tblclose(h);
+ assert(h->tblt == NULL);
+ t = h->tag;
+ t->refcnt++;
+ if (n->tok < ROFF_MAX) {
+ roff_html_pre(h, n);
+ t->refcnt--;
+ print_stagq(h, t);
+ return;
+ }
+ assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
+ if (mdoc_html_acts[n->tok - MDOC_Dd].pre != NULL &&
+ (n->end == ENDBODY_NOT || n->child != NULL))
+ child = (*mdoc_html_acts[n->tok - MDOC_Dd].pre)(meta,
+ n, h);
break;
}
- if (HTML_KEEP & h->flags) {
- if (n->prev && n->prev->line != n->line) {
- h->flags &= ~HTML_KEEP;
- h->flags |= HTML_PREKEEP;
- } else if (NULL == n->prev) {
- if (n->parent && n->parent->line != n->line) {
- h->flags &= ~HTML_KEEP;
- h->flags |= HTML_PREKEEP;
- }
- }
+ if (h->flags & HTML_KEEP && n->flags & NODE_LINE) {
+ h->flags &= ~HTML_KEEP;
+ h->flags |= HTML_PREKEEP;
}
- if (child && n->child)
- print_mdoc_nodelist(m, n->child, h);
+ if (child && n->child != NULL)
+ print_mdoc_nodelist(meta, n->child, h);
+ t->refcnt--;
print_stagq(h, t);
- bufinit(h);
switch (n->type) {
- case (MDOC_ROOT):
- mdoc_root_post(m, n, h);
+ case ROFFT_TEXT:
+ case ROFFT_EQN:
break;
default:
- if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
- (*mdocs[n->tok].post)(m, n, h);
+ if (mdoc_html_acts[n->tok - MDOC_Dd].post == NULL ||
+ n->flags & NODE_ENDED)
+ break;
+ (*mdoc_html_acts[n->tok - MDOC_Dd].post)(meta, n, h);
+ if (n->end != ENDBODY_NOT)
+ n->body->flags |= NODE_ENDED;
break;
}
-}
+ if (n->flags & NODE_NOFILL &&
+ (n->next == NULL || n->next->flags & NODE_LINE)) {
+ h->col++;
+ print_endline(h);
+ }
+}
-/* ARGSUSED */
static void
-mdoc_root_post(MDOC_ARGS)
+mdoc_root_post(const struct roff_meta *meta, struct html *h)
{
- struct htmlpair tag[3];
struct tag *t, *tt;
- char b[DATESIZ];
- time2a(m->date, b, DATESIZ);
+ t = print_otag(h, TAG_TABLE, "c", "foot");
+ tt = print_otag(h, TAG_TR, "");
- /*
- * XXX: this should use divs, but in Firefox, divs with nested
- * divs for some reason puke when trying to put a border line
- * below. So I use tables, instead.
- */
-
- PAIR_CLASS_INIT(&tag[0], "footer");
- bufcat_style(h, "width", "100%");
- PAIR_STYLE_INIT(&tag[1], h);
- PAIR_SUMMARY_INIT(&tag[2], "footer");
-
- t = print_otag(h, TAG_TABLE, 3, tag);
- tt = print_otag(h, TAG_TR, 0, NULL);
-
- bufinit(h);
- bufcat_style(h, "width", "50%");
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_TD, 1, tag);
- print_text(h, b);
+ print_otag(h, TAG_TD, "c", "foot-date");
+ print_text(h, meta->date);
print_stagq(h, tt);
- bufinit(h);
- bufcat_style(h, "width", "50%");
- bufcat_style(h, "text-align", "right");
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_TD, 1, tag);
- print_text(h, m->os);
+ print_otag(h, TAG_TD, "c", "foot-os");
+ print_text(h, meta->os);
print_tagq(h, t);
}
-
-/* ARGSUSED */
static int
-mdoc_root_pre(MDOC_ARGS)
+mdoc_root_pre(const struct roff_meta *meta, struct html *h)
{
- struct htmlpair tag[3];
struct tag *t, *tt;
- char b[BUFSIZ], title[BUFSIZ];
+ char *volume, *title;
- (void)strlcpy(b, m->vol, BUFSIZ);
-
- if (m->arch) {
- (void)strlcat(b, " (", BUFSIZ);
- (void)strlcat(b, m->arch, BUFSIZ);
- (void)strlcat(b, ")", BUFSIZ);
- }
-
- (void)snprintf(title, BUFSIZ - 1,
- "%s(%s)", m->title, m->msec);
-
- /* XXX: see note in mdoc_root_post() about divs. */
-
- PAIR_CLASS_INIT(&tag[0], "header");
- bufcat_style(h, "width", "100%");
- PAIR_STYLE_INIT(&tag[1], h);
- PAIR_SUMMARY_INIT(&tag[2], "header");
+ if (NULL == meta->arch)
+ volume = mandoc_strdup(meta->vol);
+ else
+ mandoc_asprintf(&volume, "%s (%s)",
+ meta->vol, meta->arch);
- t = print_otag(h, TAG_TABLE, 3, tag);
+ if (NULL == meta->msec)
+ title = mandoc_strdup(meta->title);
+ else
+ mandoc_asprintf(&title, "%s(%s)",
+ meta->title, meta->msec);
- tt = print_otag(h, TAG_TR, 0, NULL);
+ t = print_otag(h, TAG_TABLE, "c", "head");
+ tt = print_otag(h, TAG_TR, "");
- bufinit(h);
- bufcat_style(h, "width", "10%");
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_TD, 1, tag);
+ print_otag(h, TAG_TD, "c", "head-ltitle");
print_text(h, title);
print_stagq(h, tt);
- bufinit(h);
- bufcat_style(h, "text-align", "center");
- bufcat_style(h, "white-space", "nowrap");
- bufcat_style(h, "width", "80%");
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_TD, 1, tag);
- print_text(h, b);
+ print_otag(h, TAG_TD, "c", "head-vol");
+ print_text(h, volume);
print_stagq(h, tt);
- bufinit(h);
- bufcat_style(h, "text-align", "right");
- bufcat_style(h, "width", "10%");
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_TD, 1, tag);
+ print_otag(h, TAG_TD, "c", "head-rtitle");
print_text(h, title);
print_tagq(h, t);
- return(1);
+
+ free(title);
+ free(volume);
+ return 1;
}
+static char *
+cond_id(const struct roff_node *n)
+{
+ if (n->child != NULL &&
+ n->child->type == ROFFT_TEXT &&
+ (n->prev == NULL ||
+ (n->prev->type == ROFFT_TEXT &&
+ strcmp(n->prev->string, "|") == 0)) &&
+ (n->parent->tok == MDOC_It ||
+ (n->parent->tok == MDOC_Xo &&
+ n->parent->parent->prev == NULL &&
+ n->parent->parent->parent->tok == MDOC_It)))
+ return html_make_id(n, 1);
+ return NULL;
+}
-/* ARGSUSED */
static int
mdoc_sh_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- const struct mdoc_node *nn;
- char buf[BUFSIZ];
- struct roffsu su;
-
- if (MDOC_BODY == n->type) {
- SCALE_HS_INIT(&su, INDENT);
- bufcat_su(h, "margin-left", &su);
- PAIR_CLASS_INIT(&tag[0], "sec-body");
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
- return(1);
- } else if (MDOC_BLOCK == n->type) {
- PAIR_CLASS_INIT(&tag[0], "sec-block");
- if (n->prev && NULL == n->prev->body->child) {
- print_otag(h, TAG_DIV, 1, tag);
- return(1);
- }
-
- SCALE_VS_INIT(&su, 1);
- bufcat_su(h, "margin-top", &su);
- if (NULL == n->next)
- bufcat_su(h, "margin-bottom", &su);
-
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
- return(1);
- }
+ struct roff_node *sn, *subn;
+ struct tag *t, *tsec, *tsub;
+ char *id;
+ int sc;
- buf[0] = '\0';
- for (nn = n->child; nn; nn = nn->next) {
- html_idcat(buf, nn->string, BUFSIZ);
- if (nn->next)
- html_idcat(buf, " ", BUFSIZ);
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ html_close_paragraph(h);
+ if ((h->oflags & HTML_TOC) == 0 ||
+ h->flags & HTML_TOCDONE ||
+ n->sec <= SEC_SYNOPSIS) {
+ print_otag(h, TAG_SECTION, "c", "Sh");
+ break;
+ }
+ h->flags |= HTML_TOCDONE;
+ sc = 0;
+ for (sn = n->next; sn != NULL; sn = sn->next)
+ if (sn->sec == SEC_CUSTOM)
+ if (++sc == 2)
+ break;
+ if (sc < 2)
+ break;
+ t = print_otag(h, TAG_H1, "c", "Sh");
+ print_text(h, "TABLE OF CONTENTS");
+ print_tagq(h, t);
+ t = print_otag(h, TAG_UL, "c", "Bl-compact");
+ for (sn = n; sn != NULL; sn = sn->next) {
+ tsec = print_otag(h, TAG_LI, "");
+ id = html_make_id(sn->head, 0);
+ tsub = print_otag(h, TAG_A, "hR", id);
+ free(id);
+ print_mdoc_nodelist(meta, sn->head->child, h);
+ print_tagq(h, tsub);
+ tsub = NULL;
+ for (subn = sn->body->child; subn != NULL;
+ subn = subn->next) {
+ if (subn->tok != MDOC_Ss)
+ continue;
+ id = html_make_id(subn->head, 0);
+ if (id == NULL)
+ continue;
+ if (tsub == NULL)
+ print_otag(h, TAG_UL,
+ "c", "Bl-compact");
+ tsub = print_otag(h, TAG_LI, "");
+ print_otag(h, TAG_A, "hR", id);
+ free(id);
+ print_mdoc_nodelist(meta,
+ subn->head->child, h);
+ print_tagq(h, tsub);
+ }
+ print_tagq(h, tsec);
+ }
+ print_tagq(h, t);
+ print_otag(h, TAG_SECTION, "c", "Sh");
+ break;
+ case ROFFT_HEAD:
+ id = html_make_id(n, 1);
+ print_otag(h, TAG_H1, "ci", "Sh", id);
+ if (id != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ break;
+ case ROFFT_BODY:
+ if (n->sec == SEC_AUTHORS)
+ h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
+ break;
+ default:
+ break;
}
-
- PAIR_CLASS_INIT(&tag[0], "sec-head");
- PAIR_ID_INIT(&tag[1], buf);
-
- print_otag(h, TAG_DIV, 2, tag);
- return(1);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_ss_pre(MDOC_ARGS)
{
- struct htmlpair tag[3];
- const struct mdoc_node *nn;
- char buf[BUFSIZ];
- struct roffsu su;
-
- SCALE_VS_INIT(&su, 1);
-
- if (MDOC_BODY == n->type) {
- PAIR_CLASS_INIT(&tag[0], "ssec-body");
- if (n->parent->next && n->child) {
- bufcat_su(h, "margin-bottom", &su);
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
- } else
- print_otag(h, TAG_DIV, 1, tag);
- return(1);
- } else if (MDOC_BLOCK == n->type) {
- PAIR_CLASS_INIT(&tag[0], "ssec-block");
- if (n->prev) {
- bufcat_su(h, "margin-top", &su);
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
- } else
- print_otag(h, TAG_DIV, 1, tag);
- return(1);
- }
-
- /* TODO: see note in mdoc_sh_pre() about duplicates. */
+ char *id;
- buf[0] = '\0';
- for (nn = n->child; nn; nn = nn->next) {
- html_idcat(buf, nn->string, BUFSIZ);
- if (nn->next)
- html_idcat(buf, " ", BUFSIZ);
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ html_close_paragraph(h);
+ print_otag(h, TAG_SECTION, "c", "Ss");
+ return 1;
+ case ROFFT_HEAD:
+ break;
+ case ROFFT_BODY:
+ return 1;
+ default:
+ abort();
}
- SCALE_HS_INIT(&su, INDENT - HALFINDENT);
- su.scale = -su.scale;
- bufcat_su(h, "margin-left", &su);
-
- PAIR_CLASS_INIT(&tag[0], "ssec-head");
- PAIR_STYLE_INIT(&tag[1], h);
- PAIR_ID_INIT(&tag[2], buf);
-
- print_otag(h, TAG_DIV, 3, tag);
- return(1);
+ id = html_make_id(n, 1);
+ print_otag(h, TAG_H2, "ci", "Ss", id);
+ if (id != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_fl_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "flag");
- print_otag(h, TAG_SPAN, 1, &tag);
+ char *id;
- /* `Cm' has no leading hyphen. */
-
- if (MDOC_Cm == n->tok)
- return(1);
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_CODE, "ci", "Fl", id);
print_text(h, "\\-");
-
- if (n->child)
- h->flags |= HTML_NOSPACE;
- else if (n->next && n->next->line == n->line)
+ if (!(n->child == NULL &&
+ (n->next == NULL ||
+ n->next->type == ROFFT_TEXT ||
+ n->next->flags & NODE_LINE)))
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
-
-/* ARGSUSED */
static int
-mdoc_nd_pre(MDOC_ARGS)
+mdoc_cm_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ char *id;
- if (MDOC_BODY != n->type)
- return(1);
-
- /* XXX: this tag in theory can contain block elements. */
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_CODE, "ci", "Cm", id);
+ return 1;
+}
+static int
+mdoc_nd_pre(MDOC_ARGS)
+{
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ html_close_paragraph(h);
+ return 1;
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ break;
+ default:
+ abort();
+ }
print_text(h, "\\(em");
- PAIR_CLASS_INIT(&tag, "desc-body");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ /* Cannot use TAG_SPAN because it may contain blocks. */
+ print_otag(h, TAG_DIV, "c", "Nd");
+ return 1;
}
-
static int
mdoc_nm_pre(MDOC_ARGS)
{
- struct htmlpair tag;
- struct roffsu su;
- const char *cp;
-
- /*
- * Accomodate for `Nm' being both an element (which may have
- * NULL children AND no m->name) and a block.
- */
-
- cp = NULL;
-
- if (MDOC_ELEM == n->type) {
- if (NULL == n->child && NULL == m->name)
- return(1);
- synopsis_pre(h, n);
- PAIR_CLASS_INIT(&tag, "name");
- print_otag(h, TAG_SPAN, 1, &tag);
- if (NULL == n->child)
- print_text(h, m->name);
- } else if (MDOC_BLOCK == n->type) {
- synopsis_pre(h, n);
-
- bufcat_style(h, "clear", "both");
- if (n->head->child || m->name) {
- if (n->head->child && MDOC_TEXT ==
- n->head->child->type)
- cp = n->head->child->string;
- if (NULL == cp || '\0' == *cp)
- cp = m->name;
-
- SCALE_HS_INIT(&su, (double)strlen(cp));
- bufcat_su(h, "padding-left", &su);
- }
-
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
- } else if (MDOC_HEAD == n->type) {
- if (NULL == n->child && NULL == m->name)
- return(1);
-
- if (n->child && MDOC_TEXT == n->child->type)
- cp = n->child->string;
- if (NULL == cp || '\0' == *cp)
- cp = m->name;
-
- SCALE_HS_INIT(&su, (double)strlen(cp));
-
- bufcat_style(h, "float", "left");
- bufcat_su(h, "min-width", &su);
- SCALE_INVERT(&su);
- bufcat_su(h, "margin-left", &su);
-
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
-
- if (NULL == n->child)
- print_text(h, m->name);
- } else if (MDOC_BODY == n->type) {
- SCALE_HS_INIT(&su, 2);
- bufcat_su(h, "margin-left", &su);
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ break;
+ case ROFFT_HEAD:
+ print_otag(h, TAG_TD, "");
+ /* FALLTHROUGH */
+ case ROFFT_ELEM:
+ print_otag(h, TAG_CODE, "c", "Nm");
+ return 1;
+ case ROFFT_BODY:
+ print_otag(h, TAG_TD, "");
+ return 1;
+ default:
+ abort();
}
-
- return(1);
+ html_close_paragraph(h);
+ synopsis_pre(h, n);
+ print_otag(h, TAG_TABLE, "c", "Nm");
+ print_otag(h, TAG_TR, "");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_xr_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- const struct mdoc_node *nn;
-
if (NULL == n->child)
- return(0);
-
- PAIR_CLASS_INIT(&tag[0], "link-man");
+ return 0;
- if (h->base_man) {
- buffmt_man(h, n->child->string,
- n->child->next ?
- n->child->next->string : NULL);
- PAIR_HREF_INIT(&tag[1], h->buf);
- print_otag(h, TAG_A, 2, tag);
- } else
- print_otag(h, TAG_A, 1, tag);
+ if (h->base_man1)
+ print_otag(h, TAG_A, "chM", "Xr",
+ n->child->string, n->child->next == NULL ?
+ NULL : n->child->next->string);
+ else
+ print_otag(h, TAG_A, "c", "Xr");
- nn = n->child;
- print_text(h, nn->string);
+ n = n->child;
+ print_text(h, n->string);
- if (NULL == (nn = nn->next))
- return(0);
+ if (NULL == (n = n->next))
+ return 0;
h->flags |= HTML_NOSPACE;
print_text(h, "(");
h->flags |= HTML_NOSPACE;
- print_text(h, nn->string);
+ print_text(h, n->string);
h->flags |= HTML_NOSPACE;
print_text(h, ")");
- return(0);
+ return 0;
}
-
-/* ARGSUSED */
static int
mdoc_ns_pre(MDOC_ARGS)
{
- h->flags |= HTML_NOSPACE;
- return(1);
+ if ( ! (NODE_LINE & n->flags))
+ h->flags |= HTML_NOSPACE;
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_ar_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "arg");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_VAR, "c", "Ar");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_xx_pre(MDOC_ARGS)
{
- const char *pp;
- struct htmlpair tag;
-
- switch (n->tok) {
- case (MDOC_Bsx):
- pp = "BSDI BSD/OS";
- break;
- case (MDOC_Dx):
- pp = "DragonFly";
- break;
- case (MDOC_Fx):
- pp = "FreeBSD";
- break;
- case (MDOC_Nx):
- pp = "NetBSD";
- break;
- case (MDOC_Ox):
- pp = "OpenBSD";
- break;
- case (MDOC_Ux):
- pp = "UNIX";
- break;
- default:
- return(1);
- }
-
- PAIR_CLASS_INIT(&tag, "unix");
- print_otag(h, TAG_SPAN, 1, &tag);
- print_text(h, pp);
- return(1);
+ print_otag(h, TAG_SPAN, "c", "Ux");
+ return 1;
}
-
-/* ARGSUSED */
static int
-mdoc_bx_pre(MDOC_ARGS)
-{
- const struct mdoc_node *nn;
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "unix");
- print_otag(h, TAG_SPAN, 1, &tag);
-
- for (nn = n->child; nn; nn = nn->next)
- print_mdoc_node(m, nn, h);
-
- if (n->child)
- h->flags |= HTML_NOSPACE;
-
- print_text(h, "BSD");
- return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp,
- struct roffsu *offs, struct roffsu *width)
+mdoc_it_pre(MDOC_ARGS)
{
- struct htmlpair tag;
- const struct mdoc_node *nn;
- struct roffsu su;
-
- nn = n->parent->parent;
-
- /* XXX: see notes in mdoc_it_pre(). */
-
- if (LIST_column == type) {
- /* Don't width-pad on the left. */
- SCALE_HS_INIT(width, 0);
- /* Also disallow non-compact. */
- comp = 1;
- }
- if (LIST_diag == type)
- /* Mandate non-compact with empty prior. */
- if (n->prev && NULL == n->prev->body->child)
- comp = 1;
-
- bufcat_style(h, "clear", "both");
- if (offs->scale > 0)
- bufcat_su(h, "margin-left", offs);
- if (width->scale > 0)
- bufcat_su(h, "padding-left", width);
-
- PAIR_STYLE_INIT(&tag, h);
-
- /* Mandate compact following `Ss' and `Sh' starts. */
-
- for (nn = n; nn && ! comp; nn = nn->parent) {
- if (MDOC_BLOCK != nn->type)
- continue;
- if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
- comp = 1;
- if (nn->prev)
- break;
- }
-
- if ( ! comp) {
- SCALE_VS_INIT(&su, 1);
- bufcat_su(h, "padding-top", &su);
- }
-
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
- return(1);
-}
-
+ const struct roff_node *bl;
+ enum mdoc_list type;
-/* ARGSUSED */
-static int
-mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)
-{
- struct htmlpair tag;
- struct roffsu su;
+ bl = n->parent;
+ while (bl->tok != MDOC_Bl)
+ bl = bl->parent;
+ type = bl->norm->Bl.type;
switch (type) {
- case (LIST_item):
- /* FALLTHROUGH */
- case (LIST_ohang):
- /* FALLTHROUGH */
- case (LIST_column):
- bufcat_su(h, "min-width", width);
- bufcat_style(h, "clear", "none");
- if (n->next)
- bufcat_style(h, "float", "left");
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
+ case LIST_bullet:
+ case LIST_dash:
+ case LIST_hyphen:
+ case LIST_item:
+ case LIST_enum:
+ switch (n->type) {
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ print_otag(h, TAG_LI, "");
+ break;
+ default:
+ break;
+ }
+ break;
+ case LIST_diag:
+ case LIST_hang:
+ case LIST_inset:
+ case LIST_ohang:
+ switch (n->type) {
+ case ROFFT_HEAD:
+ print_otag(h, TAG_DT, "");
+ break;
+ case ROFFT_BODY:
+ print_otag(h, TAG_DD, "");
+ break;
+ default:
+ break;
+ }
break;
+ case LIST_tag:
+ switch (n->type) {
+ case ROFFT_HEAD:
+ print_otag(h, TAG_DT, "");
+ break;
+ case ROFFT_BODY:
+ if (n->child == NULL) {
+ print_otag(h, TAG_DD, "s", "width", "auto");
+ print_text(h, "\\ ");
+ } else
+ print_otag(h, TAG_DD, "");
+ break;
+ default:
+ break;
+ }
+ break;
+ case LIST_column:
+ switch (n->type) {
+ case ROFFT_HEAD:
+ break;
+ case ROFFT_BODY:
+ print_otag(h, TAG_TD, "");
+ break;
+ default:
+ print_otag(h, TAG_TR, "");
+ }
default:
- /*
- * XXX: this tricks CSS into aligning the bodies with
- * the right-padding in the head.
- */
- SCALE_HS_INIT(&su, 2);
- bufcat_su(h, "margin-left", &su);
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
break;
}
- return(1);
+ return 1;
}
-
-/* ARGSUSED */
static int
-mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)
+mdoc_bl_pre(MDOC_ARGS)
{
- struct htmlpair tag;
- struct ord *ord;
- char nbuf[BUFSIZ];
+ char cattr[32];
+ struct mdoc_bl *bl;
+ enum htmltag elemtype;
- switch (type) {
- case (LIST_item):
- return(0);
- case (LIST_ohang):
- print_otag(h, TAG_DIV, 0, &tag);
- return(1);
- case (LIST_column):
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ html_close_paragraph(h);
break;
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ return 1;
default:
- bufcat_su(h, "min-width", width);
- SCALE_INVERT(width);
- bufcat_su(h, "margin-left", width);
- if (n->next && n->next->child)
- bufcat_style(h, "float", "left");
-
- /* XXX: buffer if we run into body. */
- SCALE_HS_INIT(width, 1);
- bufcat_su(h, "margin-right", width);
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
- break;
+ abort();
}
- switch (type) {
- case (LIST_diag):
- PAIR_CLASS_INIT(&tag, "diag");
- print_otag(h, TAG_SPAN, 1, &tag);
+ bl = &n->norm->Bl;
+ switch (bl->type) {
+ case LIST_bullet:
+ elemtype = TAG_UL;
+ (void)strlcpy(cattr, "Bl-bullet", sizeof(cattr));
break;
- case (LIST_enum):
- ord = h->ords.head;
- assert(ord);
- nbuf[BUFSIZ - 1] = 0;
- (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
- print_text(h, nbuf);
- return(0);
- case (LIST_dash):
- print_text(h, "\\(en");
- return(0);
- case (LIST_hyphen):
- print_text(h, "\\(hy");
- return(0);
- case (LIST_bullet):
- print_text(h, "\\(bu");
- return(0);
- default:
+ case LIST_dash:
+ case LIST_hyphen:
+ elemtype = TAG_UL;
+ (void)strlcpy(cattr, "Bl-dash", sizeof(cattr));
break;
- }
-
- return(1);
-}
-
-
-static int
-mdoc_it_pre(MDOC_ARGS)
-{
- int i, comp;
- const struct mdoc_node *bl, *nn;
- struct roffsu width, offs;
- enum mdoc_list type;
-
- /*
- * XXX: be very careful in changing anything, here. Lists in
- * mandoc have many peculiarities; furthermore, they don't
- * translate well into HTML and require a bit of mangling.
- */
-
- bl = n->parent->parent;
- if (MDOC_BLOCK != n->type)
- bl = bl->parent;
-
- SCALE_HS_INIT(&offs, 0);
-
- assert(bl->data.Bl);
- type = bl->data.Bl->type;
- comp = bl->data.Bl->comp;
-
- if (bl->data.Bl->offs)
- a2offs(bl->data.Bl->offs, &offs);
-
- switch (type) {
- case (LIST_enum):
- /* FALLTHROUGH */
- case (LIST_dash):
- /* FALLTHROUGH */
- case (LIST_hyphen):
- /* FALLTHROUGH */
- case (LIST_bullet):
- SCALE_HS_INIT(&width, 2);
+ case LIST_item:
+ elemtype = TAG_UL;
+ (void)strlcpy(cattr, "Bl-item", sizeof(cattr));
break;
- default:
- SCALE_HS_INIT(&width, INDENT);
+ case LIST_enum:
+ elemtype = TAG_OL;
+ (void)strlcpy(cattr, "Bl-enum", sizeof(cattr));
break;
- }
-
- if (bl->data.Bl->width)
- a2width(bl->data.Bl->width, &width);
-
- /* Override width in some cases. */
-
- switch (type) {
- case (LIST_ohang):
- /* FALLTHROUGH */
- case (LIST_item):
- /* FALLTHROUGH */
- case (LIST_inset):
- /* FALLTHROUGH */
- case (LIST_diag):
- SCALE_HS_INIT(&width, 0);
+ case LIST_diag:
+ elemtype = TAG_DL;
+ (void)strlcpy(cattr, "Bl-diag", sizeof(cattr));
break;
- default:
- if (0 == width.scale)
- SCALE_HS_INIT(&width, INDENT);
+ case LIST_hang:
+ elemtype = TAG_DL;
+ (void)strlcpy(cattr, "Bl-hang", sizeof(cattr));
break;
+ case LIST_inset:
+ elemtype = TAG_DL;
+ (void)strlcpy(cattr, "Bl-inset", sizeof(cattr));
+ break;
+ case LIST_ohang:
+ elemtype = TAG_DL;
+ (void)strlcpy(cattr, "Bl-ohang", sizeof(cattr));
+ break;
+ case LIST_tag:
+ if (bl->offs)
+ print_otag(h, TAG_DIV, "c", "Bd-indent");
+ print_otag(h, TAG_DL, "c", bl->comp ?
+ "Bl-tag Bl-compact" : "Bl-tag");
+ return 1;
+ case LIST_column:
+ elemtype = TAG_TABLE;
+ (void)strlcpy(cattr, "Bl-column", sizeof(cattr));
+ break;
+ default:
+ abort();
}
-
- if (LIST_column == type && MDOC_BODY == n->type) {
- nn = n->parent->child;
- for (i = 0; nn && nn != n; nn = nn->next)
- if (MDOC_BODY == nn->type)
- i++;
- if (i < (int)bl->data.Bl->ncols)
- a2width(bl->data.Bl->cols[i], &width);
- }
-
- if (MDOC_HEAD == n->type)
- return(mdoc_it_head_pre(m, n, h, type, &width));
- else if (MDOC_BODY == n->type)
- return(mdoc_it_body_pre(m, n, h, type, &width));
-
- return(mdoc_it_block_pre(m, n, h, type, comp, &offs, &width));
+ if (bl->offs != NULL)
+ (void)strlcat(cattr, " Bd-indent", sizeof(cattr));
+ if (bl->comp)
+ (void)strlcat(cattr, " Bl-compact", sizeof(cattr));
+ print_otag(h, elemtype, "c", cattr);
+ return 1;
}
-
-/* ARGSUSED */
static int
-mdoc_bl_pre(MDOC_ARGS)
+mdoc_ex_pre(MDOC_ARGS)
{
- struct ord *ord;
-
- if (MDOC_HEAD == n->type)
- return(0);
- if (MDOC_BLOCK != n->type)
- return(1);
- assert(n->data.Bl);
- if (LIST_enum != n->data.Bl->type)
- return(1);
-
- ord = malloc(sizeof(struct ord));
- if (NULL == ord) {
- perror(NULL);
- exit((int)MANDOCLEVEL_SYSERR);
- }
- ord->cookie = n;
- ord->pos = 1;
- ord->next = h->ords.head;
- h->ords.head = ord;
- return(1);
+ if (n->prev)
+ print_otag(h, TAG_BR, "");
+ return 1;
}
-
-/* ARGSUSED */
-static void
-mdoc_bl_post(MDOC_ARGS)
-{
- struct ord *ord;
-
- if (MDOC_BLOCK != n->type)
- return;
- if (LIST_enum != n->data.Bl->type)
- return;
-
- ord = h->ords.head;
- assert(ord);
- h->ords.head = ord->next;
- free(ord);
-}
-
-
-/* ARGSUSED */
static int
-mdoc_ex_pre(MDOC_ARGS)
+mdoc_st_pre(MDOC_ARGS)
{
- const struct mdoc_node *nn;
- struct tag *t;
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "utility");
-
- print_text(h, "The");
- for (nn = n->child; nn; nn = nn->next) {
- t = print_otag(h, TAG_SPAN, 1, &tag);
- print_text(h, nn->string);
- print_tagq(h, t);
-
- h->flags |= HTML_NOSPACE;
-
- if (nn->next && NULL == nn->next->next)
- print_text(h, ", and");
- else if (nn->next)
- print_text(h, ",");
- else
- h->flags &= ~HTML_NOSPACE;
- }
-
- if (n->child && n->child->next)
- print_text(h, "utilities exit");
- else
- print_text(h, "utility exits");
-
- print_text(h, "0 on success, and >0 if an error occurs.");
- return(0);
+ print_otag(h, TAG_SPAN, "c", "St");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_em_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "emph");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_I, "c", "Em");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_d1_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- struct roffsu su;
-
- if (MDOC_BLOCK != n->type)
- return(1);
-
- /* FIXME: D1 shouldn't be literal. */
-
- SCALE_VS_INIT(&su, INDENT - 2);
- bufcat_su(h, "margin-left", &su);
- PAIR_CLASS_INIT(&tag[0], "lit");
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
- return(1);
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ html_close_paragraph(h);
+ break;
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ return 1;
+ default:
+ abort();
+ }
+ print_otag(h, TAG_DIV, "c", "Bd Bd-indent");
+ if (n->tok == MDOC_Dl)
+ print_otag(h, TAG_CODE, "c", "Li");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_sx_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- const struct mdoc_node *nn;
- char buf[BUFSIZ];
-
- strlcpy(buf, "#", BUFSIZ);
- for (nn = n->child; nn; nn = nn->next) {
- html_idcat(buf, nn->string, BUFSIZ);
- if (nn->next)
- html_idcat(buf, " ", BUFSIZ);
- }
+ char *id;
- PAIR_CLASS_INIT(&tag[0], "link-sec");
- PAIR_HREF_INIT(&tag[1], buf);
-
- print_otag(h, TAG_A, 2, tag);
- return(1);
+ id = html_make_id(n, 0);
+ print_otag(h, TAG_A, "chR", "Sx", id);
+ free(id);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_bd_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- int comp;
- const struct mdoc_node *nn;
- struct roffsu su;
-
- if (MDOC_HEAD == n->type)
- return(0);
-
- SCALE_VS_INIT(&su, 0);
-
- assert(n->data.Bd);
- if (n->data.Bd->offs)
- a2offs(n->data.Bd->offs, &su);
-
- comp = n->data.Bd->comp;
+ char buf[16];
+ struct roff_node *nn;
+ int comp;
- /* FIXME: -centered, etc. formatting. */
- /* FIXME: does not respect -offset ??? */
-
- if (MDOC_BLOCK == n->type) {
- bufcat_su(h, "margin-left", &su);
- for (nn = n; nn && ! comp; nn = nn->parent) {
- if (MDOC_BLOCK != nn->type)
- continue;
- if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
- comp = 1;
- if (nn->prev)
- break;
- }
- if (comp) {
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_DIV, 1, tag);
- return(1);
- }
- SCALE_VS_INIT(&su, 1);
- bufcat_su(h, "margin-top", &su);
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_DIV, 1, tag);
- return(1);
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ html_close_paragraph(h);
+ return 1;
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ break;
+ default:
+ abort();
}
- if (DISP_unfilled != n->data.Bd->type &&
- DISP_literal != n->data.Bd->type)
- return(1);
-
- PAIR_CLASS_INIT(&tag[0], "lit");
- bufcat_style(h, "white-space", "pre");
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
+ /* Handle preceding whitespace. */
- for (nn = n->child; nn; nn = nn->next) {
- print_mdoc_node(m, nn, h);
- /*
- * If the printed node flushes its own line, then we
- * needn't do it here as well. This is hacky, but the
- * notion of selective eoln whitespace is pretty dumb
- * anyway, so don't sweat it.
- */
- switch (nn->tok) {
- case (MDOC_br):
- /* FALLTHROUGH */
- case (MDOC_sp):
- /* FALLTHROUGH */
- case (MDOC_Bl):
- /* FALLTHROUGH */
- case (MDOC_Lp):
- /* FALLTHROUGH */
- case (MDOC_Pp):
+ comp = n->norm->Bd.comp;
+ for (nn = n; nn != NULL && comp == 0; nn = nn->parent) {
+ if (nn->type != ROFFT_BLOCK)
continue;
- default:
- break;
- }
- if (nn->next && nn->next->line == nn->line)
- continue;
- print_text(h, "\n");
- h->flags |= HTML_NOSPACE;
+ if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss)
+ comp = 1;
+ if (nn->prev != NULL)
+ break;
}
+ (void)strlcpy(buf, "Bd", sizeof(buf));
+ if (comp == 0)
+ (void)strlcat(buf, " Pp", sizeof(buf));
- return(0);
-}
+ /* Handle the -offset argument. */
+
+ if (n->norm->Bd.offs != NULL &&
+ strcmp(n->norm->Bd.offs, "left") != 0)
+ (void)strlcat(buf, " Bd-indent", sizeof(buf));
+ print_otag(h, TAG_DIV, "c", buf);
+ return 1;
+}
-/* ARGSUSED */
static int
mdoc_pa_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "file");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_SPAN, "c", "Pa");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_ad_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "addr");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_SPAN, "c", "Ad");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_an_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ if (n->norm->An.auth == AUTH_split) {
+ h->flags &= ~HTML_NOSPLIT;
+ h->flags |= HTML_SPLIT;
+ return 0;
+ }
+ if (n->norm->An.auth == AUTH_nosplit) {
+ h->flags &= ~HTML_SPLIT;
+ h->flags |= HTML_NOSPLIT;
+ return 0;
+ }
- /* TODO: -split and -nosplit (see termp_an_pre()). */
+ if (h->flags & HTML_SPLIT)
+ print_otag(h, TAG_BR, "");
- PAIR_CLASS_INIT(&tag, "author");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
-}
+ if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
+ h->flags |= HTML_SPLIT;
+ print_otag(h, TAG_SPAN, "c", "An");
+ return 1;
+}
-/* ARGSUSED */
static int
mdoc_cd_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
synopsis_pre(h, n);
- PAIR_CLASS_INIT(&tag, "config");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_CODE, "c", "Cd");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_dv_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ char *id;
- PAIR_CLASS_INIT(&tag, "define");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_CODE, "ci", "Dv", id);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_ev_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ char *id;
- PAIR_CLASS_INIT(&tag, "env");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_CODE, "ci", "Ev", id);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_er_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ char *id;
- PAIR_CLASS_INIT(&tag, "errno");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
-}
+ 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, 1) : NULL;
+ if (id != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_CODE, "ci", "Er", id);
+ return 1;
+}
-/* ARGSUSED */
static int
mdoc_fa_pre(MDOC_ARGS)
{
- const struct mdoc_node *nn;
- struct htmlpair tag;
+ const struct roff_node *nn;
struct tag *t;
- PAIR_CLASS_INIT(&tag, "farg");
if (n->parent->tok != MDOC_Fo) {
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_VAR, "c", "Fa");
+ return 1;
}
for (nn = n->child; nn; nn = nn->next) {
- t = print_otag(h, TAG_SPAN, 1, &tag);
+ t = print_otag(h, TAG_VAR, "c", "Fa");
print_text(h, nn->string);
print_tagq(h, t);
- if (nn->next)
+ if (nn->next) {
+ h->flags |= HTML_NOSPACE;
print_text(h, ",");
+ }
}
- if (n->child && n->next && n->next->tok == MDOC_Fa)
+ if (n->child && n->next && n->next->tok == MDOC_Fa) {
+ h->flags |= HTML_NOSPACE;
print_text(h, ",");
+ }
- return(0);
+ return 0;
}
-
-/* ARGSUSED */
static int
mdoc_fd_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ struct tag *t;
+ char *buf, *cp;
synopsis_pre(h, n);
- PAIR_CLASS_INIT(&tag, "macro");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
-}
+ if (NULL == (n = n->child))
+ return 0;
+
+ assert(n->type == ROFFT_TEXT);
+
+ if (strcmp(n->string, "#include")) {
+ print_otag(h, TAG_CODE, "c", "Fd");
+ return 1;
+ }
+
+ print_otag(h, TAG_CODE, "c", "In");
+ print_text(h, n->string);
+
+ if (NULL != (n = n->next)) {
+ assert(n->type == ROFFT_TEXT);
+
+ if (h->base_includes) {
+ cp = n->string;
+ if (*cp == '<' || *cp == '"')
+ cp++;
+ buf = mandoc_strdup(cp);
+ cp = strchr(buf, '\0') - 1;
+ if (cp >= buf && (*cp == '>' || *cp == '"'))
+ *cp = '\0';
+ t = print_otag(h, TAG_A, "chI", "In", buf);
+ free(buf);
+ } else
+ t = print_otag(h, TAG_A, "c", "In");
+
+ print_text(h, n->string);
+ print_tagq(h, t);
+
+ n = n->next;
+ }
+
+ for ( ; n; n = n->next) {
+ assert(n->type == ROFFT_TEXT);
+ print_text(h, n->string);
+ }
+ return 0;
+}
-/* ARGSUSED */
static int
mdoc_vt_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- if (MDOC_BLOCK == n->type) {
+ if (n->type == ROFFT_BLOCK) {
synopsis_pre(h, n);
- return(1);
- } else if (MDOC_ELEM == n->type) {
+ return 1;
+ } else if (n->type == ROFFT_ELEM) {
synopsis_pre(h, n);
- } else if (MDOC_HEAD == n->type)
- return(0);
+ } else if (n->type == ROFFT_HEAD)
+ return 0;
- PAIR_CLASS_INIT(&tag, "type");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_VAR, "c", "Vt");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_ft_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
synopsis_pre(h, n);
- PAIR_CLASS_INIT(&tag, "ftype");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_VAR, "c", "Ft");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_fn_pre(MDOC_ARGS)
{
- struct tag *t;
- struct htmlpair tag[2];
- const struct mdoc_node *nn;
- char nbuf[BUFSIZ];
- const char *sp, *ep;
- int sz, i;
+ struct tag *t;
+ char nbuf[BUFSIZ];
+ const char *sp, *ep;
+ int sz, pretty;
+ pretty = NODE_SYNPRETTY & n->flags;
synopsis_pre(h, n);
/* Split apart into type and name. */
ep = strchr(sp, ' ');
if (NULL != ep) {
- PAIR_CLASS_INIT(&tag[0], "ftype");
- t = print_otag(h, TAG_SPAN, 1, tag);
-
+ t = print_otag(h, TAG_VAR, "c", "Ft");
+
while (ep) {
sz = MIN((int)(ep - sp), BUFSIZ - 1);
(void)memcpy(nbuf, sp, (size_t)sz);
print_tagq(h, t);
}
- PAIR_CLASS_INIT(&tag[0], "fname");
-
- /*
- * FIXME: only refer to IDs that we know exist.
- */
-
-#if 0
- if (MDOC_SYNPRETTY & n->flags) {
- nbuf[0] = '\0';
- html_idcat(nbuf, sp, BUFSIZ);
- PAIR_ID_INIT(&tag[1], nbuf);
- } else {
- strlcpy(nbuf, "#", BUFSIZ);
- html_idcat(nbuf, sp, BUFSIZ);
- PAIR_HREF_INIT(&tag[1], nbuf);
- }
-#endif
-
- t = print_otag(h, TAG_SPAN, 1, tag);
+ t = print_otag(h, TAG_CODE, "c", "Fn");
- if (sp) {
- strlcpy(nbuf, sp, BUFSIZ);
- print_text(h, nbuf);
- }
+ if (sp)
+ print_text(h, sp);
print_tagq(h, t);
h->flags |= HTML_NOSPACE;
print_text(h, "(");
+ h->flags |= HTML_NOSPACE;
- bufinit(h);
- PAIR_CLASS_INIT(&tag[0], "farg");
- bufcat_style(h, "white-space", "nowrap");
- PAIR_STYLE_INIT(&tag[1], h);
-
- for (nn = n->child->next; nn; nn = nn->next) {
- i = 1;
- if (MDOC_SYNPRETTY & n->flags)
- i = 2;
- t = print_otag(h, TAG_SPAN, i, tag);
- print_text(h, nn->string);
+ for (n = n->child->next; n; n = n->next) {
+ if (NODE_SYNPRETTY & n->flags)
+ t = print_otag(h, TAG_VAR, "cs", "Fa",
+ "white-space", "nowrap");
+ else
+ t = print_otag(h, TAG_VAR, "c", "Fa");
+ print_text(h, n->string);
print_tagq(h, t);
- if (nn->next)
+ if (n->next) {
+ h->flags |= HTML_NOSPACE;
print_text(h, ",");
+ }
}
+ h->flags |= HTML_NOSPACE;
print_text(h, ")");
- if (MDOC_SYNPRETTY & n->flags)
+
+ if (pretty) {
+ h->flags |= HTML_NOSPACE;
print_text(h, ";");
+ }
- return(0);
+ return 0;
}
-
-/* ARGSUSED */
static int
mdoc_sm_pre(MDOC_ARGS)
{
- assert(n->child && MDOC_TEXT == n->child->type);
- if (0 == strcmp("on", n->child->string)) {
- /* FIXME: no p->col to check... */
- h->flags &= ~HTML_NOSPACE;
+ if (NULL == n->child)
+ h->flags ^= HTML_NONOSPACE;
+ else if (0 == strcmp("on", n->child->string))
h->flags &= ~HTML_NONOSPACE;
- } else
+ else
h->flags |= HTML_NONOSPACE;
- return(0);
-}
+ if ( ! (HTML_NONOSPACE & h->flags))
+ h->flags &= ~HTML_NOSPACE;
+ return 0;
+}
-/* ARGSUSED */
static int
-mdoc_sp_pre(MDOC_ARGS)
+mdoc_skip_pre(MDOC_ARGS)
{
- int len;
- struct htmlpair tag;
- struct roffsu su;
-
- switch (n->tok) {
- case (MDOC_sp):
- /* FIXME: can this have a scaling indicator? */
- len = n->child ? atoi(n->child->string) : 1;
- break;
- case (MDOC_br):
- 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;
- }
-
- SCALE_VS_INIT(&su, len);
- bufcat_su(h, "height", &su);
- PAIR_STYLE_INIT(&tag, h);
- print_otag(h, TAG_DIV, 1, &tag);
- /* So the div isn't empty: */
- print_text(h, "\\~");
-
- return(0);
+ return 0;
}
+static int
+mdoc_pp_pre(MDOC_ARGS)
+{
+ if ((n->flags & NODE_NOFILL) == 0) {
+ html_close_paragraph(h);
+ print_otag(h, TAG_P, "c", "Pp");
+ }
+ return 0;
+}
-/* ARGSUSED */
static int
mdoc_lk_pre(MDOC_ARGS)
{
- const struct mdoc_node *nn;
- struct htmlpair tag[2];
-
- nn = n->child;
-
- PAIR_CLASS_INIT(&tag[0], "link-ext");
- PAIR_HREF_INIT(&tag[1], nn->string);
- print_otag(h, TAG_A, 2, tag);
-
- if (NULL == nn->next)
- return(1);
+ const struct roff_node *link, *descr, *punct;
+ struct tag *t;
- for (nn = nn->next; nn; nn = nn->next)
- print_text(h, nn->string);
+ 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. */
+ descr = link->next;
+ if (descr == punct)
+ descr = link; /* no text */
+ t = print_otag(h, TAG_A, "ch", "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);
- return(0);
+ /* Trailing punctuation. */
+ while (punct != NULL) {
+ h->flags |= HTML_NOSPACE;
+ print_text(h, punct->string);
+ punct = punct->next;
+ }
+ return 0;
}
-
-/* ARGSUSED */
static int
mdoc_mt_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- struct tag *t;
- const struct mdoc_node *nn;
+ struct tag *t;
+ char *cp;
- PAIR_CLASS_INIT(&tag[0], "link-mail");
+ for (n = n->child; n; n = n->next) {
+ assert(n->type == ROFFT_TEXT);
- for (nn = n->child; nn; nn = nn->next) {
- bufinit(h);
- bufcat(h, "mailto:");
- bufcat(h, nn->string);
- PAIR_HREF_INIT(&tag[1], h->buf);
- t = print_otag(h, TAG_A, 2, tag);
- print_text(h, nn->string);
+ mandoc_asprintf(&cp, "mailto:%s", n->string);
+ t = print_otag(h, TAG_A, "ch", "Mt", cp);
+ print_text(h, n->string);
print_tagq(h, t);
+ free(cp);
}
-
- return(0);
-}
+ return 0;
+}
-/* ARGSUSED */
static int
mdoc_fo_pre(MDOC_ARGS)
{
- struct htmlpair tag;
struct tag *t;
- if (MDOC_BODY == n->type) {
+ if (n->type == ROFFT_BODY) {
h->flags |= HTML_NOSPACE;
print_text(h, "(");
h->flags |= HTML_NOSPACE;
- return(1);
- } else if (MDOC_BLOCK == n->type) {
+ return 1;
+ } else if (n->type == ROFFT_BLOCK) {
synopsis_pre(h, n);
- return(1);
+ return 1;
}
- /* XXX: we drop non-initial arguments as per groff. */
+ if (n->child == NULL)
+ return 0;
- assert(n->child);
assert(n->child->string);
-
- PAIR_CLASS_INIT(&tag, "fname");
- t = print_otag(h, TAG_SPAN, 1, &tag);
+ t = print_otag(h, TAG_CODE, "c", "Fn");
print_text(h, n->child->string);
print_tagq(h, t);
- return(0);
+ return 0;
}
-
-/* ARGSUSED */
static void
mdoc_fo_post(MDOC_ARGS)
{
- if (MDOC_BODY != n->type)
+ if (n->type != ROFFT_BODY)
return;
+ h->flags |= HTML_NOSPACE;
print_text(h, ")");
+ h->flags |= HTML_NOSPACE;
print_text(h, ";");
}
-
-/* ARGSUSED */
static int
mdoc_in_pre(MDOC_ARGS)
{
- const struct mdoc_node *nn;
- struct tag *t;
- struct htmlpair tag[2];
- int i;
+ struct tag *t;
synopsis_pre(h, n);
+ print_otag(h, TAG_CODE, "c", "In");
- PAIR_CLASS_INIT(&tag[0], "includes");
- print_otag(h, TAG_SPAN, 1, tag);
+ /*
+ * The first argument of the `In' gets special treatment as
+ * being a linked value. Subsequent values are printed
+ * afterward. groff does similarly. This also handles the case
+ * of no children.
+ */
- if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
+ if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags)
print_text(h, "#include");
print_text(h, "<");
h->flags |= HTML_NOSPACE;
- for (nn = n->child; nn; nn = nn->next) {
- PAIR_CLASS_INIT(&tag[0], "link-includes");
- i = 1;
- bufinit(h);
- if (h->base_includes) {
- buffmt_includes(h, nn->string);
- PAIR_HREF_INIT(&tag[i], h->buf);
- i++;
- }
- t = print_otag(h, TAG_A, i, tag);
- print_mdoc_node(m, nn, h);
+ if (NULL != (n = n->child)) {
+ assert(n->type == ROFFT_TEXT);
+
+ if (h->base_includes)
+ t = print_otag(h, TAG_A, "chI", "In", n->string);
+ else
+ t = print_otag(h, TAG_A, "c", "In");
+ print_text(h, n->string);
print_tagq(h, t);
+
+ n = n->next;
}
h->flags |= HTML_NOSPACE;
print_text(h, ">");
- return(0);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ic_pre(MDOC_ARGS)
-{
- struct htmlpair tag;
+ for ( ; n; n = n->next) {
+ assert(n->type == ROFFT_TEXT);
+ print_text(h, n->string);
+ }
- PAIR_CLASS_INIT(&tag, "cmd");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 0;
}
-
-/* ARGSUSED */
static int
-mdoc_rv_pre(MDOC_ARGS)
+mdoc_ic_pre(MDOC_ARGS)
{
- const struct mdoc_node *nn;
- struct htmlpair tag;
- struct tag *t;
-
- print_otag(h, TAG_DIV, 0, NULL);
- print_text(h, "The");
-
- for (nn = n->child; nn; nn = nn->next) {
- PAIR_CLASS_INIT(&tag, "fname");
- t = print_otag(h, TAG_SPAN, 1, &tag);
- print_text(h, nn->string);
- print_tagq(h, t);
+ char *id;
- h->flags |= HTML_NOSPACE;
- if (nn->next && NULL == nn->next->next)
- print_text(h, "(), and");
- else if (nn->next)
- print_text(h, "(),");
- else
- print_text(h, "()");
- }
-
- if (n->child && n->child->next)
- print_text(h, "functions return");
- else
- print_text(h, "function returns");
-
- print_text(h, "the value 0 if successful; otherwise the value "
- "-1 is returned and the global variable");
-
- PAIR_CLASS_INIT(&tag, "var");
- t = print_otag(h, TAG_SPAN, 1, &tag);
- print_text(h, "errno");
- print_tagq(h, t);
- print_text(h, "is set to indicate the error.");
- return(0);
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_CODE, "ci", "Ic", id);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_va_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "var");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_VAR, "c", "Va");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_ap_pre(MDOC_ARGS)
{
-
+
h->flags |= HTML_NOSPACE;
print_text(h, "\\(aq");
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_bf_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
- struct roffsu su;
-
- if (MDOC_HEAD == n->type)
- return(0);
- else if (MDOC_BODY != n->type)
- return(1);
+ const char *cattr;
- assert(n->data.Bf);
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ html_close_paragraph(h);
+ return 1;
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ break;
+ default:
+ abort();
+ }
- if (FONT_Em == n->data.Bf->font)
- PAIR_CLASS_INIT(&tag[0], "emph");
- else if (FONT_Sy == n->data.Bf->font)
- PAIR_CLASS_INIT(&tag[0], "symb");
- else if (FONT_Li == n->data.Bf->font)
- PAIR_CLASS_INIT(&tag[0], "lit");
+ if (FONT_Em == n->norm->Bf.font)
+ cattr = "Bf Em";
+ else if (FONT_Sy == n->norm->Bf.font)
+ cattr = "Bf Sy";
+ else if (FONT_Li == n->norm->Bf.font)
+ cattr = "Bf Li";
else
- PAIR_CLASS_INIT(&tag[0], "none");
+ cattr = "Bf No";
- /*
- * We want this to be inline-formatted, but needs to be div to
- * accept block children.
- */
- bufcat_style(h, "display", "inline");
- SCALE_HS_INIT(&su, 1);
- /* Needs a left-margin for spacing. */
- bufcat_su(h, "margin-left", &su);
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
- return(1);
+ /* Cannot use TAG_SPAN because it may contain blocks. */
+ print_otag(h, TAG_DIV, "c", cattr);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_ms_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ char *id;
- PAIR_CLASS_INIT(&tag, "symb");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_SPAN, "ci", "Ms", id);
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_igndelim_pre(MDOC_ARGS)
{
h->flags |= HTML_IGNDELIM;
- return(1);
+ return 1;
}
-
-/* ARGSUSED */
static void
mdoc_pf_post(MDOC_ARGS)
{
- h->flags |= HTML_NOSPACE;
+ if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
+ h->flags |= HTML_NOSPACE;
}
-
-/* ARGSUSED */
static int
mdoc_rs_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- if (MDOC_BLOCK != n->type)
- return(1);
-
- if (n->prev && SEC_SEE_ALSO == n->sec) {
- print_otag(h, TAG_BR, 0, NULL);
- print_otag(h, TAG_BR, 0, NULL);
- }
-
- PAIR_CLASS_INIT(&tag, "ref");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
-}
-
-
-
-/* ARGSUSED */
-static int
-mdoc_li_pre(MDOC_ARGS)
-{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "lit");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ switch (n->type) {
+ case ROFFT_BLOCK:
+ if (n->sec == SEC_SEE_ALSO)
+ html_close_paragraph(h);
+ break;
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ if (n->sec == SEC_SEE_ALSO)
+ print_otag(h, TAG_P, "c", "Pp");
+ print_otag(h, TAG_CITE, "c", "Rs");
+ break;
+ default:
+ abort();
+ }
+ return 1;
}
-
-/* ARGSUSED */
static int
-mdoc_sy_pre(MDOC_ARGS)
+mdoc_no_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ char *id;
- PAIR_CLASS_INIT(&tag, "symb");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_SPAN, "ci", "No", id);
+ return 1;
}
-
-/* ARGSUSED */
static int
-mdoc_bt_pre(MDOC_ARGS)
+mdoc_li_pre(MDOC_ARGS)
{
+ char *id;
- print_text(h, "is currently in beta test.");
- return(0);
+ if ((id = cond_id(n)) != NULL)
+ print_otag(h, TAG_A, "chR", "permalink", id);
+ print_otag(h, TAG_CODE, "ci", "Li", id);
+ return 1;
}
-
-/* ARGSUSED */
static int
-mdoc_ud_pre(MDOC_ARGS)
+mdoc_sy_pre(MDOC_ARGS)
{
-
- print_text(h, "currently under development.");
- return(0);
+ print_otag(h, TAG_B, "c", "Sy");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc_lb_pre(MDOC_ARGS)
{
- struct htmlpair tag;
+ if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
+ print_otag(h, TAG_BR, "");
- if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
- print_otag(h, TAG_DIV, 0, NULL);
- PAIR_CLASS_INIT(&tag, "lib");
- print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ print_otag(h, TAG_SPAN, "c", "Lb");
+ return 1;
}
-
-/* ARGSUSED */
static int
mdoc__x_pre(MDOC_ARGS)
{
- struct htmlpair tag[2];
+ const char *cattr;
+ enum htmltag t;
+
+ t = TAG_SPAN;
switch (n->tok) {
- case(MDOC__A):
- PAIR_CLASS_INIT(&tag[0], "ref-auth");
+ case MDOC__A:
+ cattr = "RsA";
if (n->prev && MDOC__A == n->prev->tok)
if (NULL == n->next || MDOC__A != n->next->tok)
print_text(h, "and");
break;
- case(MDOC__B):
- PAIR_CLASS_INIT(&tag[0], "ref-book");
- break;
- case(MDOC__C):
- PAIR_CLASS_INIT(&tag[0], "ref-city");
+ case MDOC__B:
+ t = TAG_I;
+ cattr = "RsB";
break;
- case(MDOC__D):
- PAIR_CLASS_INIT(&tag[0], "ref-date");
+ case MDOC__C:
+ cattr = "RsC";
break;
- case(MDOC__I):
- PAIR_CLASS_INIT(&tag[0], "ref-issue");
+ case MDOC__D:
+ cattr = "RsD";
break;
- case(MDOC__J):
- PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
+ case MDOC__I:
+ t = TAG_I;
+ cattr = "RsI";
break;
- case(MDOC__N):
- PAIR_CLASS_INIT(&tag[0], "ref-num");
+ case MDOC__J:
+ t = TAG_I;
+ cattr = "RsJ";
break;
- case(MDOC__O):
- PAIR_CLASS_INIT(&tag[0], "ref-opt");
+ case MDOC__N:
+ cattr = "RsN";
break;
- case(MDOC__P):
- PAIR_CLASS_INIT(&tag[0], "ref-page");
+ case MDOC__O:
+ cattr = "RsO";
break;
- case(MDOC__Q):
- PAIR_CLASS_INIT(&tag[0], "ref-corp");
+ case MDOC__P:
+ cattr = "RsP";
break;
- case(MDOC__R):
- PAIR_CLASS_INIT(&tag[0], "ref-rep");
+ case MDOC__Q:
+ cattr = "RsQ";
break;
- case(MDOC__T):
- PAIR_CLASS_INIT(&tag[0], "ref-title");
+ case MDOC__R:
+ cattr = "RsR";
break;
- case(MDOC__U):
- PAIR_CLASS_INIT(&tag[0], "link-ref");
+ case MDOC__T:
+ cattr = "RsT";
break;
- case(MDOC__V):
- PAIR_CLASS_INIT(&tag[0], "ref-vol");
+ case MDOC__U:
+ print_otag(h, TAG_A, "ch", "RsU", n->child->string);
+ return 1;
+ case MDOC__V:
+ cattr = "RsV";
break;
default:
abort();
- /* NOTREACHED */
- }
-
- if (MDOC__U != n->tok) {
- print_otag(h, TAG_SPAN, 1, tag);
- return(1);
}
- PAIR_HREF_INIT(&tag[1], n->child->string);
- print_otag(h, TAG_A, 2, tag);
-
- return(1);
+ print_otag(h, t, "c", cattr);
+ return 1;
}
-
-/* ARGSUSED */
static void
mdoc__x_post(MDOC_ARGS)
{
if (NULL == n->parent || MDOC_Rs != n->parent->tok)
return;
+ h->flags |= HTML_NOSPACE;
print_text(h, n->next ? "," : ".");
}
-
-/* ARGSUSED */
static int
mdoc_bk_pre(MDOC_ARGS)
{
switch (n->type) {
- case (MDOC_BLOCK):
+ case ROFFT_BLOCK:
break;
- case (MDOC_HEAD):
- return(0);
- case (MDOC_BODY):
- h->flags |= HTML_PREKEEP;
+ case ROFFT_HEAD:
+ return 0;
+ case ROFFT_BODY:
+ if (n->parent->args != NULL || n->prev->child == NULL)
+ h->flags |= HTML_PREKEEP;
break;
default:
abort();
- /* NOTREACHED */
}
- return(1);
+ return 1;
}
-
-/* ARGSUSED */
static void
mdoc_bk_post(MDOC_ARGS)
{
- if (MDOC_BODY == n->type)
+ if (n->type == ROFFT_BODY)
h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
}
-
-/* ARGSUSED */
static int
mdoc_quote_pre(MDOC_ARGS)
{
- struct htmlpair tag;
-
- if (MDOC_BODY != n->type)
- return(1);
+ if (n->type != ROFFT_BODY)
+ return 1;
switch (n->tok) {
- case (MDOC_Ao):
- /* FALLTHROUGH */
- case (MDOC_Aq):
- print_text(h, "\\(la");
+ case MDOC_Ao:
+ case MDOC_Aq:
+ print_text(h, n->child != NULL && n->child->next == NULL &&
+ n->child->tok == MDOC_Mt ? "<" : "\\(la");
break;
- case (MDOC_Bro):
- /* FALLTHROUGH */
- case (MDOC_Brq):
+ case MDOC_Bro:
+ case MDOC_Brq:
print_text(h, "\\(lC");
break;
- case (MDOC_Bo):
- /* FALLTHROUGH */
- case (MDOC_Bq):
+ case MDOC_Bo:
+ case MDOC_Bq:
print_text(h, "\\(lB");
break;
- case (MDOC_Oo):
- /* FALLTHROUGH */
- case (MDOC_Op):
+ case MDOC_Oo:
+ case MDOC_Op:
print_text(h, "\\(lB");
- h->flags |= HTML_NOSPACE;
- PAIR_CLASS_INIT(&tag, "opt");
- print_otag(h, TAG_SPAN, 1, &tag);
+ /*
+ * Give up on semantic markup for now.
+ * We cannot use TAG_SPAN because .Oo may contain blocks.
+ * We cannot use TAG_IDIV because we might be in a
+ * phrasing context (like .Dl or .Pp); we cannot
+ * close out a .Pp at this point either because
+ * that would break the line.
+ */
+ /* XXX print_otag(h, TAG_???, "c", "Op"); */
break;
- case (MDOC_Do):
- /* FALLTHROUGH */
- case (MDOC_Dq):
- /* FALLTHROUGH */
- case (MDOC_Qo):
- /* FALLTHROUGH */
- case (MDOC_Qq):
+ case MDOC_En:
+ if (NULL == n->norm->Es ||
+ NULL == n->norm->Es->child)
+ return 1;
+ print_text(h, n->norm->Es->child->string);
+ break;
+ case MDOC_Do:
+ case MDOC_Dq:
+ case MDOC_Qo:
+ case MDOC_Qq:
print_text(h, "\\(lq");
break;
- case (MDOC_Po):
- /* FALLTHROUGH */
- case (MDOC_Pq):
+ case MDOC_Po:
+ case MDOC_Pq:
print_text(h, "(");
break;
- case (MDOC_Ql):
- /* FALLTHROUGH */
- case (MDOC_So):
- /* FALLTHROUGH */
- case (MDOC_Sq):
+ case MDOC_Ql:
+ print_text(h, "\\(oq");
+ h->flags |= HTML_NOSPACE;
+ print_otag(h, TAG_CODE, "c", "Li");
+ break;
+ case MDOC_So:
+ case MDOC_Sq:
print_text(h, "\\(oq");
break;
default:
abort();
- /* NOTREACHED */
}
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
-
-/* ARGSUSED */
static void
mdoc_quote_post(MDOC_ARGS)
{
- if (MDOC_BODY != n->type)
+ if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
return;
h->flags |= HTML_NOSPACE;
switch (n->tok) {
- case (MDOC_Ao):
- /* FALLTHROUGH */
- case (MDOC_Aq):
- print_text(h, "\\(ra");
+ case MDOC_Ao:
+ case MDOC_Aq:
+ print_text(h, n->child != NULL && n->child->next == NULL &&
+ n->child->tok == MDOC_Mt ? ">" : "\\(ra");
break;
- case (MDOC_Bro):
- /* FALLTHROUGH */
- case (MDOC_Brq):
+ case MDOC_Bro:
+ case MDOC_Brq:
print_text(h, "\\(rC");
break;
- case (MDOC_Oo):
- /* FALLTHROUGH */
- case (MDOC_Op):
- /* FALLTHROUGH */
- case (MDOC_Bo):
- /* FALLTHROUGH */
- case (MDOC_Bq):
+ case MDOC_Oo:
+ case MDOC_Op:
+ case MDOC_Bo:
+ case MDOC_Bq:
print_text(h, "\\(rB");
break;
- case (MDOC_Qo):
- /* FALLTHROUGH */
- case (MDOC_Qq):
- /* FALLTHROUGH */
- case (MDOC_Do):
- /* FALLTHROUGH */
- case (MDOC_Dq):
+ case MDOC_En:
+ if (n->norm->Es == NULL ||
+ n->norm->Es->child == NULL ||
+ n->norm->Es->child->next == NULL)
+ h->flags &= ~HTML_NOSPACE;
+ else
+ print_text(h, n->norm->Es->child->next->string);
+ break;
+ case MDOC_Qo:
+ case MDOC_Qq:
+ case MDOC_Do:
+ case MDOC_Dq:
print_text(h, "\\(rq");
break;
- case (MDOC_Po):
- /* FALLTHROUGH */
- case (MDOC_Pq):
+ case MDOC_Po:
+ case MDOC_Pq:
print_text(h, ")");
break;
- case (MDOC_Ql):
- /* FALLTHROUGH */
- case (MDOC_So):
- /* FALLTHROUGH */
- case (MDOC_Sq):
- print_text(h, "\\(aq");
+ case MDOC_Ql:
+ case MDOC_So:
+ case MDOC_Sq:
+ print_text(h, "\\(cq");
break;
default:
abort();
- /* NOTREACHED */
}
}
+static int
+mdoc_eo_pre(MDOC_ARGS)
+{
+
+ if (n->type != ROFFT_BODY)
+ return 1;
+
+ if (n->end == ENDBODY_NOT &&
+ n->parent->head->child == NULL &&
+ n->child != NULL &&
+ n->child->end != ENDBODY_NOT)
+ print_text(h, "\\&");
+ else if (n->end != ENDBODY_NOT ? n->child != NULL :
+ n->parent->head->child != NULL && (n->child != NULL ||
+ (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+ h->flags |= HTML_NOSPACE;
+ return 1;
+}
+
+static void
+mdoc_eo_post(MDOC_ARGS)
+{
+ int body, tail;
+
+ if (n->type != ROFFT_BODY)
+ return;
+
+ if (n->end != ENDBODY_NOT) {
+ h->flags &= ~HTML_NOSPACE;
+ return;
+ }
+ body = n->child != NULL || n->parent->head->child != NULL;
+ tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+ if (body && tail)
+ h->flags |= HTML_NOSPACE;
+ else if ( ! tail)
+ h->flags &= ~HTML_NOSPACE;
+}
+
+static int
+mdoc_abort_pre(MDOC_ARGS)
+{
+ abort();
+}
git.ckatri.com / mandoc.git / blobdiff