When rendering the \h (horizontal motion) low-level roff(7) escape

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index d8795bb167e7493e20f1a36eb0c312e9ede4ed18..c0a0a6a5697876c5197a357fc834be7f245cd0b7 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_html.c,v 1.255 2017/01/19 16:59:30 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.342 2021/03/30 19:26:20 schwarze Exp $ */

 /*
 /*

+ * Copyright (c) 2014-2021 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2014, 2015, 2016, 2017 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,6 +14,8 @@
  * 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.
  * 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.

+ *
+ * HTML formatter for mdoc(7) used by mandoc(1).

  */
 #include "config.h"
 
  */
 #include "config.h"
 


@@ -27,14 +29,13 @@
 #include <unistd.h>
 
 #include "mandoc_aux.h"
 #include <unistd.h>
 
 #include "mandoc_aux.h"

+#include "mandoc.h"

 #include "roff.h"
 #include "mdoc.h"
 #include "out.h"
 #include "html.h"
 #include "main.h"
 
 #include "roff.h"
 #include "mdoc.h"
 #include "out.h"
 #include "html.h"
 #include "main.h"
 

-#define        INDENT           5
-

 #define        MDOC_ARGS         const struct roff_meta *meta, \
                          struct roff_node *n, \
                          struct html *h
 #define        MDOC_ARGS         const struct roff_meta *meta, \
                          struct roff_node *n, \
                          struct html *h


@@ -43,23 +44,25 @@
 #define        MIN(a,b)        ((/*CONSTCOND*/(a)<(b))?(a):(b))
 #endif
 
 #define        MIN(a,b)        ((/*CONSTCOND*/(a)<(b))?(a):(b))
 #endif
 

-struct htmlmdoc {
+struct mdoc_html_act {

        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);
 };
 
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);
 };
 

-static char             *make_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              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);

-static void              synopsis_pre(struct html *,
-                               const struct roff_node *);
+static void              synopsis_pre(struct html *, 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 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_ad_pre(MDOC_ARGS);
 static int               mdoc_an_pre(MDOC_ARGS);
 static int               mdoc_ap_pre(MDOC_ARGS);


@@ -70,8 +73,8 @@ static        void              mdoc_bk_post(MDOC_ARGS);
 static int               mdoc_bk_pre(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static int               mdoc_cd_pre(MDOC_ARGS);
 static int               mdoc_bk_pre(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static int               mdoc_cd_pre(MDOC_ARGS);

+static int               mdoc_code_pre(MDOC_ARGS);

 static int               mdoc_d1_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_fd_pre(MDOC_ARGS);
 static int               mdoc_fl_pre(MDOC_ARGS);
 static int               mdoc_fa_pre(MDOC_ARGS);
 static int               mdoc_fd_pre(MDOC_ARGS);
 static int               mdoc_fl_pre(MDOC_ARGS);


@@ -80,20 +83,15 @@ 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_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 void              mdoc_fo_post(MDOC_ARGS);
 static int               mdoc_fo_pre(MDOC_ARGS);
 static int               mdoc_ex_pre(MDOC_ARGS);
 static void              mdoc_fo_post(MDOC_ARGS);
 static int               mdoc_fo_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_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_igndelim_pre(MDOC_ARGS);
 static int               mdoc_in_pre(MDOC_ARGS);
 static int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);

-static int               mdoc_li_pre(MDOC_ARGS);

 static int               mdoc_lk_pre(MDOC_ARGS);
 static int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_lk_pre(MDOC_ARGS);
 static int               mdoc_mt_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_nd_pre(MDOC_ARGS);
 static int               mdoc_nm_pre(MDOC_ARGS);
 static int               mdoc_no_pre(MDOC_ARGS);


@@ -107,17 +105,17 @@ 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_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_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_sx_pre(MDOC_ARGS);
 static int               mdoc_sy_pre(MDOC_ARGS);

+static int               mdoc_tg_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 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 */
        {NULL, NULL}, /* Dd */
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */


@@ -133,28 +131,29 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_it_pre, NULL}, /* It */
        {mdoc_ad_pre, NULL}, /* Ad */
        {mdoc_an_pre, NULL}, /* An */
        {mdoc_it_pre, NULL}, /* It */
        {mdoc_ad_pre, NULL}, /* Ad */
        {mdoc_an_pre, NULL}, /* An */

+       {mdoc_ap_pre, NULL}, /* Ap */

        {mdoc_ar_pre, NULL}, /* Ar */
        {mdoc_cd_pre, NULL}, /* Cd */
        {mdoc_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_code_pre, NULL}, /* Cm */
+       {mdoc_code_pre, NULL}, /* Dv */
+       {mdoc_code_pre, NULL}, /* Er */
+       {mdoc_code_pre, NULL}, /* Ev */

        {mdoc_ex_pre, NULL}, /* Ex */
        {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_ex_pre, NULL}, /* Ex */
        {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_code_pre, NULL}, /* Ic */

        {mdoc_in_pre, NULL}, /* In */
        {mdoc_in_pre, NULL}, /* In */

-       {mdoc_li_pre, NULL}, /* Li */
+       {mdoc_code_pre, NULL}, /* Li */

        {mdoc_nd_pre, NULL}, /* Nd */
        {mdoc_nm_pre, NULL}, /* Nm */
        {mdoc_quote_pre, mdoc_quote_post}, /* Op */
        {mdoc_nd_pre, NULL}, /* Nd */
        {mdoc_nm_pre, NULL}, /* Nm */
        {mdoc_quote_pre, mdoc_quote_post}, /* Op */

-       {mdoc_ft_pre, NULL}, /* Ot */
+       {mdoc_abort_pre, NULL}, /* Ot */

        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_ex_pre, NULL}, /* Rv */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_ex_pre, NULL}, /* Rv */

-       {NULL, NULL}, /* St */
+       {mdoc_st_pre, NULL}, /* St */

        {mdoc_va_pre, NULL}, /* Va */
        {mdoc_vt_pre, NULL}, /* Vt */
        {mdoc_xr_pre, NULL}, /* Xr */
        {mdoc_va_pre, NULL}, /* Va */
        {mdoc_vt_pre, NULL}, /* Vt */
        {mdoc_xr_pre, NULL}, /* Xr */


@@ -172,7 +171,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Ac */
        {mdoc_quote_pre, mdoc_quote_post}, /* Ao */
        {mdoc_quote_pre, mdoc_quote_post}, /* Aq */
        {NULL, NULL}, /* Ac */
        {mdoc_quote_pre, mdoc_quote_post}, /* Ao */
        {mdoc_quote_pre, mdoc_quote_post}, /* Aq */

-       {NULL, NULL}, /* At */
+       {mdoc_xx_pre, NULL}, /* At */

        {NULL, NULL}, /* Bc */
        {mdoc_bf_pre, NULL}, /* Bf */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bo */
        {NULL, NULL}, /* Bc */
        {mdoc_bf_pre, NULL}, /* Bf */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bo */


@@ -188,7 +187,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_em_pre, NULL}, /* Em */
        {mdoc_eo_pre, mdoc_eo_post}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */
        {mdoc_em_pre, NULL}, /* Em */
        {mdoc_eo_pre, mdoc_eo_post}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */

-       {mdoc_ms_pre, NULL}, /* Ms */
+       {mdoc_no_pre, NULL}, /* Ms */

        {mdoc_no_pre, NULL}, /* No */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
        {mdoc_no_pre, NULL}, /* No */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */


@@ -224,7 +223,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_em_pre, NULL}, /* Fr */
        {NULL, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
        {mdoc_em_pre, NULL}, /* Fr */
        {NULL, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */

-       {mdoc_pp_pre, NULL}, /* Lp */
+       {mdoc_abort_pre, NULL}, /* Lp */

        {mdoc_lk_pre, NULL}, /* Lk */
        {mdoc_mt_pre, NULL}, /* Mt */
        {mdoc_quote_pre, mdoc_quote_post}, /* Brq */
        {mdoc_lk_pre, NULL}, /* Lk */
        {mdoc_mt_pre, NULL}, /* Mt */
        {mdoc_quote_pre, mdoc_quote_post}, /* Brq */


@@ -235,26 +234,9 @@ static     const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_quote_pre, mdoc_quote_post}, /* En */
        {mdoc_xx_pre, NULL}, /* Dx */
        {mdoc__x_pre, mdoc__x_post}, /* %Q */
        {mdoc_quote_pre, mdoc_quote_post}, /* En */
        {mdoc_xx_pre, NULL}, /* Dx */
        {mdoc__x_pre, mdoc__x_post}, /* %Q */

-       {mdoc_sp_pre, NULL}, /* br */
-       {mdoc_sp_pre, NULL}, /* sp */

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

-       {mdoc_skip_pre, NULL}, /* ll */
-};
-
-static const char * const lists[LIST_MAX] = {
-       NULL,
-       "list-bul",
-       "list-col",
-       "list-dash",
-       "list-diag",
-       "list-enum",
-       "list-hang",
-       "list-hyph",
-       "list-inset",
-       "list-item",
-       "list-ohang",
-       "list-tag"
+       {mdoc_tg_pre, NULL}, /* Tg */

 };
 
 
 };
 
 


@@ -262,13 +244,15 @@ static    const char * const lists[LIST_MAX] = {
  * See the same function in mdoc_term.c for documentation.
  */
 static void
  * See the same function in mdoc_term.c for documentation.
  */
 static void

-synopsis_pre(struct html *h, const struct roff_node *n)
+synopsis_pre(struct html *h, struct roff_node *n)

 {
 {

+       struct roff_node *np;

 
 

-       if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))
+       if ((n->flags & NODE_SYNPRETTY) == 0 ||
+           (np = roff_node_prev(n)) == NULL)

                return;
 
                return;
 

-       if (n->prev->tok == n->tok &&
+       if (np->tok == n->tok &&

            MDOC_Fo != n->tok &&
            MDOC_Ft != n->tok &&
            MDOC_Fn != n->tok) {
            MDOC_Fo != n->tok &&
            MDOC_Ft != n->tok &&
            MDOC_Fn != n->tok) {


@@ -276,53 +260,56 @@ synopsis_pre(struct html *h, const struct roff_node *n)
                return;
        }
 
                return;
        }
 

-       switch (n->prev->tok) {
+       switch (np->tok) {

        case MDOC_Fd:
        case MDOC_Fn:
        case MDOC_Fo:
        case MDOC_In:
        case MDOC_Vt:
        case MDOC_Fd:
        case MDOC_Fn:
        case MDOC_Fo:
        case MDOC_In:
        case MDOC_Vt:

-               print_paragraph(h);

                break;
        case MDOC_Ft:
                break;
        case MDOC_Ft:

-               if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
-                       print_paragraph(h);
+               if (n->tok != MDOC_Fn && n->tok != MDOC_Fo)

                        break;
                        break;

-               }

                /* FALLTHROUGH */
        default:
                print_otag(h, TAG_BR, "");
                /* FALLTHROUGH */
        default:
                print_otag(h, TAG_BR, "");

-               break;
+               return;

        }
        }

+       html_close_paragraph(h);
+       print_otag(h, TAG_P, "c", "Pp");

 }
 
 void
 }
 
 void

-html_mdoc(void *arg, const struct roff_man *mdoc)
+html_mdoc(void *arg, const struct roff_meta *mdoc)

 {
 {

-       struct html     *h;
-       struct tag      *t;
+       struct html             *h;
+       struct roff_node        *n;
+       struct tag              *t;

 
        h = (struct html *)arg;
 
        h = (struct html *)arg;

+       n = mdoc->first->child;

 
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");
 
        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, "");
                t = print_otag(h, TAG_HEAD, "");

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

                print_tagq(h, t);
                print_otag(h, TAG_BODY, "");
        }
 
                print_tagq(h, t);
                print_otag(h, TAG_BODY, "");
        }
 

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

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

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

        print_tagq(h, t);
        print_tagq(h, t);

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

        print_tagq(h, NULL);
 }
 
 static void
        print_tagq(h, NULL);
 }
 
 static void

-print_mdoc_head(MDOC_ARGS)
+print_mdoc_head(const struct roff_meta *meta, struct html *h)

 {
        char    *cp;
 
 {
        char    *cp;
 


@@ -356,35 +343,51 @@ print_mdoc_nodelist(MDOC_ARGS)
 static void
 print_mdoc_node(MDOC_ARGS)
 {
 static void
 print_mdoc_node(MDOC_ARGS)
 {

-       int              child;

        struct tag      *t;
        struct tag      *t;

+       int              child;

 
 

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

                return;
 
                return;
 

+       if ((n->flags & NODE_NOFILL) == 0)
+               html_fillmode(h, ROFF_fi);
+       else if (html_fillmode(h, ROFF_nf) == ROFF_nf &&
+           n->tok != ROFF_fi && n->flags & NODE_LINE)
+               print_endline(h);
+

        child = 1;
        child = 1;

-       t = h->tags.head;

        n->flags &= ~NODE_ENDED;
        n->flags &= ~NODE_ENDED;

-

        switch (n->type) {
        case ROFFT_TEXT:
        switch (n->type) {
        case ROFFT_TEXT:

-               /* 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 && NODE_LINE & n->flags)
-                       if ( ! (HTML_LITERAL & h->flags))
-                               print_otag(h, TAG_BR, "");
-               if (NODE_DELIMC & n->flags)
+               if (n->flags & NODE_LINE) {
+                       switch (*n->string) {
+                       case '\0':
+                               h->col = 1;
+                               print_endline(h);
+                               return;
+                       case ' ':
+                               if ((h->flags & HTML_NONEWLINE) == 0 &&
+                                   (n->flags & NODE_NOFILL) == 0)
+                                       print_otag(h, TAG_BR, "");
+                               break;
+                       default:
+                               break;
+                       }
+               }
+               t = h->tag;
+               t->refcnt++;
+               if (n->flags & NODE_DELIMC)

                        h->flags |= HTML_NOSPACE;
                        h->flags |= HTML_NOSPACE;

-               print_text(h, n->string);
-               if (NODE_DELIMO & n->flags)
+               if (n->flags & NODE_HREF)
+                       print_tagged_text(h, n->string, n);
+               else
+                       print_text(h, n->string);
+               if (n->flags & NODE_DELIMO)

                        h->flags |= HTML_NOSPACE;
                        h->flags |= HTML_NOSPACE;

-               return;
+               break;

        case ROFFT_EQN:
        case ROFFT_EQN:

+               t = h->tag;
+               t->refcnt++;

                print_eqn(h, n->eqn);
                break;
        case ROFFT_TBL:
                print_eqn(h, n->eqn);
                break;
        case ROFFT_TBL:


@@ -401,13 +404,22 @@ print_mdoc_node(MDOC_ARGS)
                 * the "meta" table state.  This will be reopened on the
                 * next table element.
                 */
                 * the "meta" table state.  This will be reopened on the
                 * next table element.
                 */

-               if (h->tblt != NULL) {
+               if (h->tblt != NULL)

                        print_tblclose(h);
                        print_tblclose(h);

-                       t = h->tags.head;
-               }

                assert(h->tblt == NULL);
                assert(h->tblt == NULL);

-               if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))
-                       child = (*mdocs[n->tok].pre)(meta, n, h);
+               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;
        }
 
                break;
        }
 


@@ -416,33 +428,33 @@ print_mdoc_node(MDOC_ARGS)
                h->flags |= HTML_PREKEEP;
        }
 
                h->flags |= HTML_PREKEEP;
        }
 

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

                print_mdoc_nodelist(meta, n->child, h);
 
                print_mdoc_nodelist(meta, n->child, h);
 

+       t->refcnt--;

        print_stagq(h, t);
 
        switch (n->type) {
        print_stagq(h, t);
 
        switch (n->type) {

+       case ROFFT_TEXT:

        case ROFFT_EQN:
                break;
        default:
        case ROFFT_EQN:
                break;
        default:

-               if ( ! mdocs[n->tok].post || n->flags & NODE_ENDED)
+               if (mdoc_html_acts[n->tok - MDOC_Dd].post == NULL ||
+                   n->flags & NODE_ENDED)

                        break;
                        break;

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

                if (n->end != ENDBODY_NOT)
                        n->body->flags |= NODE_ENDED;
                if (n->end != ENDBODY_NOT)
                        n->body->flags |= NODE_ENDED;

-               if (n->end == ENDBODY_NOSPACE)
-                       h->flags |= HTML_NOSPACE;

                break;
        }
 }
 
 static void
                break;
        }
 }
 
 static void

-mdoc_root_post(MDOC_ARGS)
+mdoc_root_post(const struct roff_meta *meta, struct html *h)

 {
        struct tag      *t, *tt;
 
        t = print_otag(h, TAG_TABLE, "c", "foot");
 {
        struct tag      *t, *tt;
 
        t = print_otag(h, TAG_TABLE, "c", "foot");

-       print_otag(h, TAG_TBODY, "");

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


@@ -455,7 +467,7 @@ mdoc_root_post(MDOC_ARGS)
 }
 
 static int
 }
 
 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;
 {
        struct tag      *t, *tt;
        char            *volume, *title;


@@ -473,7 +485,6 @@ mdoc_root_pre(MDOC_ARGS)
                    meta->title, meta->msec);
 
        t = print_otag(h, TAG_TABLE, "c", "head");
                    meta->title, meta->msec);
 
        t = print_otag(h, TAG_TABLE, "c", "head");

-       print_otag(h, TAG_TBODY, "");

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


@@ -493,86 +504,115 @@ mdoc_root_pre(MDOC_ARGS)
        return 1;
 }
 
        return 1;
 }
 

-static char *
-make_id(const struct roff_node *n)
+static int
+mdoc_code_pre(MDOC_ARGS)

 {
 {

-       const struct roff_node  *nch;
-       char                    *buf, *cp;
-
-       for (nch = n->child; nch != NULL; nch = nch->next)
-               if (nch->type != ROFFT_TEXT)
-                       return NULL;
-
-       buf = NULL;
-       deroff(&buf, n);
-
-       /* http://www.w3.org/TR/html5/dom.html#the-id-attribute */
-
-       for (cp = buf; *cp != '\0'; cp++)
-               if (*cp == ' ')
-                       *cp = '_';
-
-       return buf;
+       print_otag_id(h, TAG_CODE, roff_name[n->tok], n);
+       return 1;

 }
 
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {

-       char    *id;
+       struct roff_node        *sn, *subn;
+       struct tag              *t, *tsec, *tsub;
+       char                    *id;
+       int                      sc;

 
        switch (n->type) {
        case ROFFT_BLOCK:
 
        switch (n->type) {
        case ROFFT_BLOCK:

-               return 1;
+               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:
+               print_otag_id(h, TAG_H1, "Sh", n);
+               break;

        case ROFFT_BODY:
                if (n->sec == SEC_AUTHORS)
                        h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
        case ROFFT_BODY:
                if (n->sec == SEC_AUTHORS)
                        h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);

-               return 1;
+               break;

        default:
                break;
        }
        default:
                break;
        }

-
-       if ((id = make_id(n)) != NULL) {
-               print_otag(h, TAG_H1, "ci", "Sh", id);
-               free(id);
-       } else
-               print_otag(h, TAG_H1, "c", "Sh");
-

        return 1;
 }
 
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {

-       char    *id;
-
-       if (n->type != ROFFT_HEAD)
-               return 1;
-
-       if ((id = make_id(n)) != NULL) {
-               print_otag(h, TAG_H2, "ci", "Ss", id);
-               free(id);
-       } else
-               print_otag(h, TAG_H2, "c", "Ss");
-
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               print_otag(h, TAG_SECTION, "c", "Ss");
+               break;
+       case ROFFT_HEAD:
+               print_otag_id(h, TAG_H2, "Ss", n);
+               break;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();
+       }

        return 1;
 }
 
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_B, "c", "flag");
-
-       /* `Cm' has no leading hyphen. */
-
-       if (MDOC_Cm == n->tok)
-               return 1;
+       struct roff_node        *nn;

 
 

+       print_otag_id(h, TAG_CODE, "Fl", n);

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

-
-       if (!(n->child == NULL &&
-           (n->next == NULL ||
-            n->next->type == ROFFT_TEXT ||
-            n->next->flags & NODE_LINE)))
+       if (n->child != NULL ||
+           ((nn = roff_node_next(n)) != NULL &&
+            nn->type != ROFFT_TEXT &&
+            (nn->flags & NODE_LINE) == 0))

                h->flags |= HTML_NOSPACE;
 
        return 1;
                h->flags |= HTML_NOSPACE;
 
        return 1;


@@ -581,50 +621,42 @@ mdoc_fl_pre(MDOC_ARGS)
 static int
 mdoc_nd_pre(MDOC_ARGS)
 {
 static int
 mdoc_nd_pre(MDOC_ARGS)
 {

-       if (n->type != ROFFT_BODY)
+       switch (n->type) {
+       case ROFFT_BLOCK:

                return 1;
                return 1;

-
-       /* XXX: this tag in theory can contain block elements. */
-
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();
+       }

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

-       print_otag(h, TAG_SPAN, "c", "desc");
+       print_otag(h, TAG_SPAN, "c", "Nd");

        return 1;
 }
 
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {

-       int              len;
-

        switch (n->type) {
        switch (n->type) {

+       case ROFFT_BLOCK:
+               break;

        case ROFFT_HEAD:
                print_otag(h, TAG_TD, "");
                /* FALLTHROUGH */
        case ROFFT_ELEM:
        case ROFFT_HEAD:
                print_otag(h, TAG_TD, "");
                /* FALLTHROUGH */
        case ROFFT_ELEM:

-               print_otag(h, TAG_B, "c", "name");
-               if (n->child == NULL && meta->name != NULL)
-                       print_text(h, meta->name);
+               print_otag(h, TAG_CODE, "c", "Nm");

                return 1;
        case ROFFT_BODY:
                print_otag(h, TAG_TD, "");
                return 1;
        default:
                return 1;
        case ROFFT_BODY:
                print_otag(h, TAG_TD, "");
                return 1;
        default:

-               break;
+               abort();

        }
        }

-
+       html_close_paragraph(h);

        synopsis_pre(h, n);
        synopsis_pre(h, n);

-       print_otag(h, TAG_TABLE, "c", "synopsis");
-
-       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);
-
-       print_otag(h, TAG_COL, "shw", len);
-       print_otag(h, TAG_COL, "");
-       print_otag(h, TAG_TBODY, "");
+       print_otag(h, TAG_TABLE, "c", "Nm");

        print_otag(h, TAG_TR, "");
        return 1;
 }
        print_otag(h, TAG_TR, "");
        return 1;
 }


@@ -635,7 +667,7 @@ mdoc_xr_pre(MDOC_ARGS)
        if (NULL == n->child)
                return 0;
 
        if (NULL == n->child)
                return 0;
 

-       if (h->base_man)
+       if (h->base_man1)

                print_otag(h, TAG_A, "chM", "Xr",
                    n->child->string, n->child->next == NULL ?
                    NULL : n->child->next->string);
                print_otag(h, TAG_A, "chM", "Xr",
                    n->child->string, n->child->next == NULL ?
                    NULL : n->child->next->string);


@@ -657,6 +689,18 @@ mdoc_xr_pre(MDOC_ARGS)
        return 0;
 }
 
        return 0;
 }
 

+static int
+mdoc_tg_pre(MDOC_ARGS)
+{
+       char    *id;
+
+       if ((id = html_make_id(n, 1)) != NULL) {
+               print_tagq(h, print_otag(h, TAG_MARK, "i", id));
+               free(id);
+       }
+       return 0;
+}
+

 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {


@@ -669,89 +713,87 @@ mdoc_ns_pre(MDOC_ARGS)
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_I, "c", "arg");
+       print_otag(h, TAG_VAR, "c", "Ar");

        return 1;
 }
 
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_SPAN, "c", "unix");
+       print_otag(h, TAG_SPAN, "c", "Ux");

        return 1;
 }
 
 static int
 mdoc_it_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_it_pre(MDOC_ARGS)
 {

-       enum mdoc_list   type;
-       const struct roff_node *bl;
+       const struct roff_node  *bl;
+       enum mdoc_list           type;

 
        bl = n->parent;
 
        bl = n->parent;

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

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

-       if (n->type == ROFFT_HEAD) {
-               switch (type) {
-               case LIST_bullet:
-               case LIST_dash:
-               case LIST_item:
-               case LIST_hyphen:
-               case LIST_enum:
+       switch (type) {
+       case LIST_bullet:
+       case LIST_dash:
+       case LIST_hyphen:
+       case LIST_item:
+       case LIST_enum:
+               switch (n->type) {
+               case ROFFT_HEAD:

                        return 0;
                        return 0;

-               case LIST_diag:
-               case LIST_hang:
-               case LIST_inset:
-               case LIST_ohang:
-               case LIST_tag:
-                       print_otag(h, TAG_DT, "csvt", lists[type],
-                           !bl->norm->Bl.comp);
-                       if (LIST_diag != type)
-                               break;
-                       print_otag(h, TAG_B, "c", "diag");
-                       break;
-               case LIST_column:
+               case ROFFT_BODY:
+                       print_otag_id(h, TAG_LI, NULL, n);

                        break;
                default:
                        break;
                }
                        break;
                default:
                        break;
                }

-       } else if (n->type == ROFFT_BODY) {
-               switch (type) {
-               case LIST_bullet:
-               case LIST_hyphen:
-               case LIST_dash:
-               case LIST_enum:
-               case LIST_item:
-                       print_otag(h, TAG_LI, "csvt", lists[type],
-                           !bl->norm->Bl.comp);
-                       break;
-               case LIST_diag:
-               case LIST_hang:
-               case LIST_inset:
-               case LIST_ohang:
-               case LIST_tag:
-                       if (NULL == bl->norm->Bl.width) {
-                               print_otag(h, TAG_DD, "c", lists[type]);
-                               break;
-                       }
-                       print_otag(h, TAG_DD, "cswl", lists[type],
-                           bl->norm->Bl.width);
+               break;
+       case LIST_diag:
+       case LIST_hang:
+       case LIST_inset:
+       case LIST_ohang:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       print_otag_id(h, TAG_DT, NULL, n);

                        break;
                        break;

-               case LIST_column:
-                       print_otag(h, TAG_TD, "csvt", lists[type],
-                           !bl->norm->Bl.comp);
+               case ROFFT_BODY:
+                       print_otag(h, TAG_DD, "");

                        break;
                default:
                        break;
                }
                        break;
                default:
                        break;
                }

-       } else {
-               switch (type) {
-               case LIST_column:
-                       print_otag(h, TAG_TR, "c", lists[type]);
+               break;
+       case LIST_tag:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       print_otag_id(h, TAG_DT, NULL, n);
+                       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;
                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_id(h, TAG_TR, NULL, n);
+               }
+       default:
+               break;

        }
 
        return 1;
        }
 
        return 1;


@@ -760,97 +802,117 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {

-       int              i;
-       char             buf[BUFSIZ];
+       char             cattr[32];
+       struct mdoc_bl  *bl;

        enum htmltag     elemtype;
 
        enum htmltag     elemtype;
 

-       if (n->type == ROFFT_BODY) {
-               if (LIST_column == n->norm->Bl.type)
-                       print_otag(h, TAG_TBODY, "");
-               return 1;
-       }
-
-       if (n->type == ROFFT_HEAD) {
-               if (LIST_column != n->norm->Bl.type)
-                       return 0;
-
-               /*
-                * For each column, print out the <COL> tag with our
-                * suggested width.  The last column gets min-width, as
-                * in terminal mode it auto-sizes to the width of the
-                * screen and we want to preserve that behaviour.
-                */
-
-               for (i = 0; i < (int)n->norm->Bl.ncols - 1; i++)
-                       print_otag(h, TAG_COL, "sww", n->norm->Bl.cols[i]);
-               print_otag(h, TAG_COL, "swW", n->norm->Bl.cols[i]);
-
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               break;
+       case ROFFT_HEAD:

                return 0;
                return 0;

+       case ROFFT_BODY:
+               return 1;
+       default:
+               abort();

        }
 
        }
 

-       assert(lists[n->norm->Bl.type]);
-       (void)strlcpy(buf, "list ", BUFSIZ);
-       (void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
-
-       switch (n->norm->Bl.type) {
+       bl = &n->norm->Bl;
+       switch (bl->type) {

        case LIST_bullet:
        case LIST_bullet:

+               elemtype = TAG_UL;
+               (void)strlcpy(cattr, "Bl-bullet", sizeof(cattr));
+               break;

        case LIST_dash:
        case LIST_hyphen:
        case LIST_dash:
        case LIST_hyphen:

+               elemtype = TAG_UL;
+               (void)strlcpy(cattr, "Bl-dash", sizeof(cattr));
+               break;

        case LIST_item:
                elemtype = TAG_UL;
        case LIST_item:
                elemtype = TAG_UL;

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

                break;
        case LIST_enum:
                elemtype = TAG_OL;
                break;
        case LIST_enum:
                elemtype = TAG_OL;

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

                break;
        case LIST_diag:
                break;
        case LIST_diag:

+               elemtype = TAG_DL;
+               (void)strlcpy(cattr, "Bl-diag", sizeof(cattr));
+               break;

        case LIST_hang:
        case LIST_hang:

+               elemtype = TAG_DL;
+               (void)strlcpy(cattr, "Bl-hang", sizeof(cattr));
+               break;

        case LIST_inset:
        case LIST_inset:

+               elemtype = TAG_DL;
+               (void)strlcpy(cattr, "Bl-inset", sizeof(cattr));
+               break;

        case LIST_ohang:
        case LIST_ohang:

-       case LIST_tag:

                elemtype = TAG_DL;
                elemtype = TAG_DL;

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

                break;
                break;

+       case LIST_tag:
+               if (bl->offs)
+                       print_otag(h, TAG_DIV, "c", "Bd-indent");
+               print_otag_id(h, TAG_DL,
+                   bl->comp ? "Bl-tag Bl-compact" : "Bl-tag", n->body);
+               return 1;

        case LIST_column:
                elemtype = TAG_TABLE;
        case LIST_column:
                elemtype = TAG_TABLE;

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

                break;
        default:
                abort();
        }
                break;
        default:
                abort();
        }

-
-       if (n->norm->Bl.offs)
-               print_otag(h, elemtype, "csvtvbwl", buf, 0, 0,
-                   n->norm->Bl.offs);
-       else
-               print_otag(h, elemtype, "csvtvb", buf, 0, 0);
-
+       if (bl->offs != NULL)
+               (void)strlcat(cattr, " Bd-indent", sizeof(cattr));
+       if (bl->comp)
+               (void)strlcat(cattr, " Bl-compact", sizeof(cattr));
+       print_otag_id(h, elemtype, cattr, n->body);

        return 1;
 }
 
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {

-       if (n->prev)
+       if (roff_node_prev(n) != NULL)

                print_otag(h, TAG_BR, "");
        return 1;
 }
 
                print_otag(h, TAG_BR, "");
        return 1;
 }
 

+static int
+mdoc_st_pre(MDOC_ARGS)
+{
+       print_otag(h, TAG_SPAN, "c", "St");
+       return 1;
+}
+

 static int
 mdoc_em_pre(MDOC_ARGS)
 {
 static int
 mdoc_em_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_SPAN, "c", "emph");
+       print_otag_id(h, TAG_I, "Em", n);

        return 1;
 }
 
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {

-       if (n->type != ROFFT_BLOCK)
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);

                return 1;
                return 1;

-
-       print_otag(h, TAG_DIV, "c", "D1");
-
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();
+       }
+       print_otag_id(h, TAG_DIV, "Bd Bd-indent", n);

        if (n->tok == MDOC_Dl)
                print_otag(h, TAG_CODE, "c", "Li");
        if (n->tok == MDOC_Dl)
                print_otag(h, TAG_CODE, "c", "Li");

-

        return 1;
 }
 
        return 1;
 }
 


@@ -859,114 +921,70 @@ mdoc_sx_pre(MDOC_ARGS)
 {
        char    *id;
 
 {
        char    *id;
 

-       if ((id = make_id(n)) != NULL) {
-               print_otag(h, TAG_A, "chR", "Sx", id);
-               free(id);
-       } else
-               print_otag(h, TAG_A, "c", "Sx");
-
+       id = html_make_id(n, 0);
+       print_otag(h, TAG_A, "chR", "Sx", id);
+       free(id);

        return 1;
 }
 
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {

-       int                      comp, offs, sv;
+       char                     buf[20];

        struct roff_node        *nn;
        struct roff_node        *nn;

+       int                      comp;

 
 

-       if (n->type == ROFFT_HEAD)
-               return 0;
-
-       if (n->type == ROFFT_BLOCK) {
-               comp = n->norm->Bd.comp;
-               for (nn = n; nn && ! comp; nn = nn->parent) {
-                       if (nn->type != ROFFT_BLOCK)
-                               continue;
-                       if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
-                               comp = 1;
-                       if (nn->prev)
-                               break;
-               }
-               if ( ! comp)
-                       print_paragraph(h);
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);

                return 1;
                return 1;

+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();

        }
 
        }
 

-       /* Handle the -offset argument. */
-
-       if (n->norm->Bd.offs == NULL ||
-           ! strcmp(n->norm->Bd.offs, "left"))
-               offs = 0;
-       else if ( ! strcmp(n->norm->Bd.offs, "indent"))
-               offs = INDENT;
-       else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
-               offs = INDENT * 2;
-       else
-               offs = -1;
+       /* Handle preceding whitespace. */

 
 

-       if (offs == -1)
-               print_otag(h, TAG_DIV, "cswl", "Bd", n->norm->Bd.offs);
-       else
-               print_otag(h, TAG_DIV, "cshl", "Bd", offs);
-
-       if (n->norm->Bd.type != DISP_unfilled &&
-           n->norm->Bd.type != DISP_literal)
-               return 1;
-
-       print_otag(h, TAG_PRE, "c", "Li");
-
-       /* This can be recursive: save & set our literal state. */
-
-       sv = h->flags & HTML_LITERAL;
-       h->flags |= HTML_LITERAL;
-
-       for (nn = n->child; nn; nn = nn->next) {
-               print_mdoc_node(meta, 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_Sm:
-               case MDOC_br:
-               case MDOC_sp:
-               case MDOC_Bl:
-               case MDOC_D1:
-               case MDOC_Dl:
-               case MDOC_Lp:
-               case MDOC_Pp:
+       comp = n->norm->Bd.comp;
+       for (nn = n; nn != NULL && comp == 0; nn = nn->parent) {
+               if (nn->type != ROFFT_BLOCK)

                        continue;
                        continue;

-               default:
+               if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss)
+                       comp = 1;
+               if (roff_node_prev(nn) != NULL)

                        break;
                        break;

-               }
-               if (h->flags & HTML_NONEWLINE ||
-                   (nn->next && ! (nn->next->flags & NODE_LINE)))
-                       continue;
-               else if (nn->next)
-                       print_text(h, "\n");
-
-               h->flags |= HTML_NOSPACE;

        }
        }

+       (void)strlcpy(buf, "Bd", sizeof(buf));
+       if (comp == 0)
+               (void)strlcat(buf, " Pp", sizeof(buf));

 
 

-       if (0 == sv)
-               h->flags &= ~HTML_LITERAL;
+       /* Handle the -offset argument. */

 
 

-       return 0;
+       if (n->norm->Bd.offs != NULL &&
+           strcmp(n->norm->Bd.offs, "left") != 0)
+               (void)strlcat(buf, " Bd-indent", sizeof(buf));
+
+       if (n->norm->Bd.type == DISP_literal)
+               (void)strlcat(buf, " Li", sizeof(buf));
+
+       print_otag_id(h, TAG_DIV, buf, n);
+       return 1;

 }
 
 static int
 mdoc_pa_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_pa_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_I, "c", "file");
+       print_otag(h, TAG_SPAN, "c", "Pa");

        return 1;
 }
 
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_I, "c", "addr");
+       print_otag(h, TAG_SPAN, "c", "Ad");

        return 1;
 }
 
        return 1;
 }
 


@@ -990,7 +1008,7 @@ mdoc_an_pre(MDOC_ARGS)
        if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
                h->flags |= HTML_SPLIT;
 
        if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
                h->flags |= HTML_SPLIT;
 

-       print_otag(h, TAG_SPAN, "c", "author");
+       print_otag(h, TAG_SPAN, "c", "An");

        return 1;
 }
 
        return 1;
 }
 


@@ -998,28 +1016,7 @@ static int
 mdoc_cd_pre(MDOC_ARGS)
 {
        synopsis_pre(h, n);
 mdoc_cd_pre(MDOC_ARGS)
 {
        synopsis_pre(h, n);

-       print_otag(h, TAG_B, "c", "config");
-       return 1;
-}
-
-static int
-mdoc_dv_pre(MDOC_ARGS)
-{
-       print_otag(h, TAG_SPAN, "c", "define");
-       return 1;
-}
-
-static int
-mdoc_ev_pre(MDOC_ARGS)
-{
-       print_otag(h, TAG_SPAN, "c", "env");
-       return 1;
-}
-
-static int
-mdoc_er_pre(MDOC_ARGS)
-{
-       print_otag(h, TAG_SPAN, "c", "errno");
+       print_otag(h, TAG_CODE, "c", "Cd");

        return 1;
 }
 
        return 1;
 }
 


@@ -1030,25 +1027,24 @@ mdoc_fa_pre(MDOC_ARGS)
        struct tag              *t;
 
        if (n->parent->tok != MDOC_Fo) {
        struct tag              *t;
 
        if (n->parent->tok != MDOC_Fo) {

-               print_otag(h, TAG_I, "c", "farg");
+               print_otag(h, TAG_VAR, "c", "Fa");

                return 1;
        }
                return 1;
        }

-
-       for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_I, "c", "farg");
+       for (nn = n->child; nn != NULL; nn = nn->next) {
+               t = print_otag(h, TAG_VAR, "c", "Fa");

                print_text(h, nn->string);
                print_tagq(h, t);
                print_text(h, nn->string);
                print_tagq(h, t);

-               if (nn->next) {
+               if (nn->next != NULL) {

                        h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
                }
        }
                        h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
                }
        }

-
-       if (n->child && n->next && n->next->tok == MDOC_Fa) {
+       if (n->child != NULL &&
+           (nn = roff_node_next(n)) != NULL &&
+           nn->tok == MDOC_Fa) {

                h->flags |= HTML_NOSPACE;
                print_text(h, ",");
        }
                h->flags |= HTML_NOSPACE;
                print_text(h, ",");
        }

-

        return 0;
 }
 
        return 0;
 }
 


@@ -1066,11 +1062,11 @@ mdoc_fd_pre(MDOC_ARGS)
        assert(n->type == ROFFT_TEXT);
 
        if (strcmp(n->string, "#include")) {
        assert(n->type == ROFFT_TEXT);
 
        if (strcmp(n->string, "#include")) {

-               print_otag(h, TAG_B, "c", "macro");
+               print_otag(h, TAG_CODE, "c", "Fd");

                return 1;
        }
 
                return 1;
        }
 

-       print_otag(h, TAG_B, "c", "includes");
+       print_otag(h, TAG_CODE, "c", "In");

        print_text(h, n->string);
 
        if (NULL != (n = n->next)) {
        print_text(h, n->string);
 
        if (NULL != (n = n->next)) {


@@ -1084,10 +1080,10 @@ mdoc_fd_pre(MDOC_ARGS)
                        cp = strchr(buf, '\0') - 1;
                        if (cp >= buf && (*cp == '>' || *cp == '"'))
                                *cp = '\0';
                        cp = strchr(buf, '\0') - 1;
                        if (cp >= buf && (*cp == '>' || *cp == '"'))
                                *cp = '\0';

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

                        free(buf);
                } else
                        free(buf);
                } else

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

 
                print_text(h, n->string);
                print_tagq(h, t);
 
                print_text(h, n->string);
                print_tagq(h, t);


@@ -1114,7 +1110,7 @@ mdoc_vt_pre(MDOC_ARGS)
        } else if (n->type == ROFFT_HEAD)
                return 0;
 
        } else if (n->type == ROFFT_HEAD)
                return 0;
 

-       print_otag(h, TAG_SPAN, "c", "type");
+       print_otag(h, TAG_VAR, "c", "Vt");

        return 1;
 }
 
        return 1;
 }
 


@@ -1122,7 +1118,7 @@ static int
 mdoc_ft_pre(MDOC_ARGS)
 {
        synopsis_pre(h, n);
 mdoc_ft_pre(MDOC_ARGS)
 {
        synopsis_pre(h, n);

-       print_otag(h, TAG_I, "c", "ftype");
+       print_otag(h, TAG_VAR, "c", "Ft");

        return 1;
 }
 
        return 1;
 }
 


@@ -1143,7 +1139,7 @@ mdoc_fn_pre(MDOC_ARGS)
 
        ep = strchr(sp, ' ');
        if (NULL != ep) {
 
        ep = strchr(sp, ' ');
        if (NULL != ep) {

-               t = print_otag(h, TAG_I, "c", "ftype");
+               t = print_otag(h, TAG_VAR, "c", "Ft");

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


@@ -1156,7 +1152,7 @@ mdoc_fn_pre(MDOC_ARGS)
                print_tagq(h, t);
        }
 
                print_tagq(h, t);
        }
 

-       t = print_otag(h, TAG_B, "c", "fname");
+       t = print_otag_id(h, TAG_CODE, "Fn", n);

 
        if (sp)
                print_text(h, sp);
 
        if (sp)
                print_text(h, sp);


@@ -1169,10 +1165,10 @@ mdoc_fn_pre(MDOC_ARGS)
 
        for (n = n->child->next; n; n = n->next) {
                if (NODE_SYNPRETTY & n->flags)
 
        for (n = n->child->next; n; n = n->next) {
                if (NODE_SYNPRETTY & n->flags)

-                       t = print_otag(h, TAG_I, "css?", "farg",
+                       t = print_otag(h, TAG_VAR, "cs", "Fa",

                            "white-space", "nowrap");
                else
                            "white-space", "nowrap");
                else

-                       t = print_otag(h, TAG_I, "c", "farg");
+                       t = print_otag(h, TAG_VAR, "c", "Fa");

                print_text(h, n->string);
                print_tagq(h, t);
                if (n->next) {
                print_text(h, n->string);
                print_tagq(h, t);
                if (n->next) {


@@ -1219,53 +1215,59 @@ mdoc_skip_pre(MDOC_ARGS)
 static int
 mdoc_pp_pre(MDOC_ARGS)
 {
 static int
 mdoc_pp_pre(MDOC_ARGS)
 {

+       char    *id;

 
 

-       print_paragraph(h);
-       return 0;
-}
-
-static int
-mdoc_sp_pre(MDOC_ARGS)
-{
-       struct roffsu    su;
-
-       SCALE_VS_INIT(&su, 1);
-
-       if (MDOC_sp == n->tok) {
-               if (NULL != (n = n->child)) {
-                       if ( ! a2roffsu(n->string, &su, SCALE_VS))
-                               su.scale = 1.0;
-                       else if (su.scale < 0.0)
-                               su.scale = 0.0;
+       if (n->flags & NODE_NOFILL) {
+               print_endline(h);
+               if (n->flags & NODE_ID)
+                       mdoc_tg_pre(meta, n, h);
+               else {
+                       h->col = 1;
+                       print_endline(h);

                }
                }

-       } else
-               su.scale = 0.0;
-
-       print_otag(h, TAG_DIV, "suh", &su);
-
-       /* So the div isn't empty: */
-       print_text(h, "\\~");
-
+       } else {
+               html_close_paragraph(h);
+               id = n->flags & NODE_ID ? html_make_id(n, 1) : NULL;
+               print_otag(h, TAG_P, "ci", "Pp", id);
+               free(id);
+       }

        return 0;
        return 0;

-

 }
 
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {

-       if (NULL == (n = n->child))
-               return 0;
-
-       assert(n->type == ROFFT_TEXT);
-
-       print_otag(h, TAG_A, "ch", "link-ext", n->string);
+       const struct roff_node *link, *descr, *punct;
+       struct tag      *t;

 
 

-       if (NULL == n->next)
-               print_text(h, n->string);
+       if ((link = n->child) == NULL)
+               return 0;

 
 

-       for (n = n->next; n; n = n->next)
-               print_text(h, n->string);
+       /* 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);

 
 

+       /* Trailing punctuation. */
+       while (punct != NULL) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, punct->string);
+               punct = punct->next;
+       }

        return 0;
 }
 
        return 0;
 }
 


@@ -1277,14 +1279,12 @@ mdoc_mt_pre(MDOC_ARGS)
 
        for (n = n->child; n; n = n->next) {
                assert(n->type == ROFFT_TEXT);
 
        for (n = n->child; n; n = n->next) {
                assert(n->type == ROFFT_TEXT);

-

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

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

                print_text(h, n->string);
                print_tagq(h, t);
                free(cp);
        }
                print_text(h, n->string);
                print_tagq(h, t);
                free(cp);
        }

-

        return 0;
 }
 
        return 0;
 }
 


@@ -1293,30 +1293,30 @@ mdoc_fo_pre(MDOC_ARGS)
 {
        struct tag      *t;
 
 {
        struct tag      *t;
 

-       if (n->type == ROFFT_BODY) {
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               synopsis_pre(h, n);
+               return 1;
+       case ROFFT_HEAD:
+               if (n->child != NULL) {
+                       t = print_otag_id(h, TAG_CODE, "Fn", n);
+                       print_text(h, n->child->string);
+                       print_tagq(h, t);
+               }
+               return 0;
+       case ROFFT_BODY:

                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return 1;
                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return 1;

-       } else if (n->type == ROFFT_BLOCK) {
-               synopsis_pre(h, n);
-               return 1;
+       default:
+               abort();

        }
        }

-
-       if (n->child == NULL)
-               return 0;
-
-       assert(n->child->string);
-       t = print_otag(h, TAG_B, "c", "fname");
-       print_text(h, n->child->string);
-       print_tagq(h, t);
-       return 0;

 }
 
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
 }
 
 static void
 mdoc_fo_post(MDOC_ARGS)
 {

-

        if (n->type != ROFFT_BODY)
                return;
        h->flags |= HTML_NOSPACE;
        if (n->type != ROFFT_BODY)
                return;
        h->flags |= HTML_NOSPACE;


@@ -1331,7 +1331,7 @@ mdoc_in_pre(MDOC_ARGS)
        struct tag      *t;
 
        synopsis_pre(h, n);
        struct tag      *t;
 
        synopsis_pre(h, n);

-       print_otag(h, TAG_B, "c", "includes");
+       print_otag(h, TAG_CODE, "c", "In");

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


@@ -1350,10 +1350,9 @@ mdoc_in_pre(MDOC_ARGS)
                assert(n->type == ROFFT_TEXT);
 
                if (h->base_includes)
                assert(n->type == ROFFT_TEXT);
 
                if (h->base_includes)

-                       t = print_otag(h, TAG_A, "chI", "link-includes",
-                           n->string);
+                       t = print_otag(h, TAG_A, "chI", "In", n->string);

                else
                else

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

                print_text(h, n->string);
                print_tagq(h, t);
 
                print_text(h, n->string);
                print_tagq(h, t);
 


@@ -1367,28 +1366,19 @@ mdoc_in_pre(MDOC_ARGS)
                assert(n->type == ROFFT_TEXT);
                print_text(h, n->string);
        }
                assert(n->type == ROFFT_TEXT);
                print_text(h, n->string);
        }

-

        return 0;
 }
 
        return 0;
 }
 

-static int
-mdoc_ic_pre(MDOC_ARGS)
-{
-       print_otag(h, TAG_B, "c", "cmd");
-       return 1;
-}
-

 static int
 mdoc_va_pre(MDOC_ARGS)
 {
 static int
 mdoc_va_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_B, "c", "var");
+       print_otag(h, TAG_VAR, "c", "Va");

        return 1;
 }
 
 static int
 mdoc_ap_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_ap_pre(MDOC_ARGS)
 {

-

        h->flags |= HTML_NOSPACE;
        print_text(h, "\\(aq");
        h->flags |= HTML_NOSPACE;
        h->flags |= HTML_NOSPACE;
        print_text(h, "\\(aq");
        h->flags |= HTML_NOSPACE;


@@ -1400,40 +1390,35 @@ mdoc_bf_pre(MDOC_ARGS)
 {
        const char      *cattr;
 
 {
        const char      *cattr;
 

-       if (n->type == ROFFT_HEAD)
-               return 0;
-       else if (n->type != ROFFT_BODY)
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);

                return 1;
                return 1;

+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();
+       }

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

-               cattr = "emph";
+               cattr = "Bf Em";

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

-               cattr = "symb";
+               cattr = "Bf Sy";

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

-               cattr = "Li";
+               cattr = "Bf Li";

        else
        else

-               cattr = "none";
-
-       /*
-        * We want this to be inline-formatted, but needs to be div to
-        * accept block children.
-        */
+               cattr = "Bf No";

 
 

-       print_otag(h, TAG_DIV, "css?hl", cattr, "display", "inline", 1);
-       return 1;
-}
-
-static int
-mdoc_ms_pre(MDOC_ARGS)
-{
-       print_otag(h, TAG_SPAN, "c", "symb");
+       /* Cannot use TAG_SPAN because it may contain blocks. */
+       print_otag(h, TAG_DIV, "c", cattr);

        return 1;
 }
 
 static int
 mdoc_igndelim_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_igndelim_pre(MDOC_ARGS)
 {

-

        h->flags |= HTML_IGNDELIM;
        return 1;
 }
        h->flags |= HTML_IGNDELIM;
        return 1;
 }


@@ -1441,7 +1426,6 @@ mdoc_igndelim_pre(MDOC_ARGS)
 static void
 mdoc_pf_post(MDOC_ARGS)
 {
 static void
 mdoc_pf_post(MDOC_ARGS)
 {

-

        if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
                h->flags |= HTML_NOSPACE;
 }
        if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
                h->flags |= HTML_NOSPACE;
 }


@@ -1449,134 +1433,134 @@ mdoc_pf_post(MDOC_ARGS)
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {

-       if (n->type != ROFFT_BLOCK)
-               return 1;
-
-       if (n->prev && SEC_SEE_ALSO == n->sec)
-               print_paragraph(h);
-
-       print_otag(h, TAG_SPAN, "c", "ref");
+       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;
 }
 
 static int
 mdoc_no_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_no_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_SPAN, "c", "none");
-       return 1;
-}
-
-static int
-mdoc_li_pre(MDOC_ARGS)
-{
-       print_otag(h, TAG_CODE, "c", "Li");
+       print_otag_id(h, TAG_SPAN, roff_name[n->tok], n);

        return 1;
 }
 
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_SPAN, "c", "symb");
+       print_otag_id(h, TAG_B, "Sy", n);

        return 1;
 }
 
 static int
 mdoc_lb_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc_lb_pre(MDOC_ARGS)
 {

-       if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
+       if (n->sec == SEC_LIBRARY &&
+           n->flags & NODE_LINE &&
+           roff_node_prev(n) != NULL)

                print_otag(h, TAG_BR, "");
 
                print_otag(h, TAG_BR, "");
 

-       print_otag(h, TAG_SPAN, "c", "lib");
+       print_otag(h, TAG_SPAN, "c", "Lb");

        return 1;
 }
 
 static int
 mdoc__x_pre(MDOC_ARGS)
 {
        return 1;
 }
 
 static int
 mdoc__x_pre(MDOC_ARGS)
 {

-       const char      *cattr;
-       enum htmltag     t;
+       struct roff_node        *nn;
+       const char              *cattr;
+       enum htmltag             t;

 
        t = TAG_SPAN;
 
        switch (n->tok) {
        case MDOC__A:
 
        t = TAG_SPAN;
 
        switch (n->tok) {
        case MDOC__A:

-               cattr = "ref-auth";
-               if (n->prev && MDOC__A == n->prev->tok)
-                       if (NULL == n->next || MDOC__A != n->next->tok)
-                               print_text(h, "and");
+               cattr = "RsA";
+               if ((nn = roff_node_prev(n)) != NULL && nn->tok == MDOC__A &&
+                   ((nn = roff_node_next(n)) == NULL || nn->tok != MDOC__A))
+                       print_text(h, "and");

                break;
        case MDOC__B:
                break;
        case MDOC__B:

-               cattr = "ref-book";

                t = TAG_I;
                t = TAG_I;

+               cattr = "RsB";

                break;
        case MDOC__C:
                break;
        case MDOC__C:

-               cattr = "ref-city";
+               cattr = "RsC";

                break;
        case MDOC__D:
                break;
        case MDOC__D:

-               cattr = "ref-date";
+               cattr = "RsD";

                break;
        case MDOC__I:
                break;
        case MDOC__I:

-               cattr = "ref-issue";

                t = TAG_I;
                t = TAG_I;

+               cattr = "RsI";

                break;
        case MDOC__J:
                break;
        case MDOC__J:

-               cattr = "ref-jrnl";

                t = TAG_I;
                t = TAG_I;

+               cattr = "RsJ";

                break;
        case MDOC__N:
                break;
        case MDOC__N:

-               cattr = "ref-num";
+               cattr = "RsN";

                break;
        case MDOC__O:
                break;
        case MDOC__O:

-               cattr = "ref-opt";
+               cattr = "RsO";

                break;
        case MDOC__P:
                break;
        case MDOC__P:

-               cattr = "ref-page";
+               cattr = "RsP";

                break;
        case MDOC__Q:
                break;
        case MDOC__Q:

-               cattr = "ref-corp";
+               cattr = "RsQ";

                break;
        case MDOC__R:
                break;
        case MDOC__R:

-               cattr = "ref-rep";
+               cattr = "RsR";

                break;
        case MDOC__T:
                break;
        case MDOC__T:

-               cattr = "ref-title";
+               cattr = "RsT";

                break;
        case MDOC__U:
                break;
        case MDOC__U:

-               cattr = "link-ref";
-               break;
+               print_otag(h, TAG_A, "ch", "RsU", n->child->string);
+               return 1;

        case MDOC__V:
        case MDOC__V:

-               cattr = "ref-vol";
+               cattr = "RsV";

                break;
        default:
                abort();
        }
 
                break;
        default:
                abort();
        }
 

-       if (MDOC__U != n->tok) {
-               print_otag(h, t, "c", cattr);
-               return 1;
-       }
-
-       print_otag(h, TAG_A, "ch", cattr, n->child->string);
-
+       print_otag(h, t, "c", cattr);

        return 1;
 }
 
 static void
 mdoc__x_post(MDOC_ARGS)
 {
        return 1;
 }
 
 static void
 mdoc__x_post(MDOC_ARGS)
 {

+       struct roff_node *nn;

 
 

-       if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)
-               if (NULL == n->next->next || MDOC__A != n->next->next->tok)
-                       if (NULL == n->prev || MDOC__A != n->prev->tok)
-                               return;
+       if (n->tok == MDOC__A &&
+           (nn = roff_node_next(n)) != NULL && nn->tok == MDOC__A &&
+           ((nn = roff_node_next(nn)) == NULL || nn->tok != MDOC__A) &&
+           ((nn = roff_node_prev(n)) == NULL || nn->tok != MDOC__A))
+               return;

 
        /* TODO: %U */
 
 
        /* TODO: %U */
 

-       if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+       if (n->parent == NULL || n->parent->tok != MDOC_Rs)

                return;
 
        h->flags |= HTML_NOSPACE;
                return;
 
        h->flags |= HTML_NOSPACE;

-       print_text(h, n->next ? "," : ".");
+       print_text(h, roff_node_next(n) ? "," : ".");

 }
 
 static int
 }
 
 static int


@@ -1630,8 +1614,15 @@ mdoc_quote_pre(MDOC_ARGS)
        case MDOC_Oo:
        case MDOC_Op:
                print_text(h, "\\(lB");
        case MDOC_Oo:
        case MDOC_Op:
                print_text(h, "\\(lB");

-               h->flags |= HTML_NOSPACE;
-               print_otag(h, TAG_SPAN, "c", "opt");
+               /*
+                * Give up on semantic markup for now.
+                * We cannot use TAG_SPAN because .Oo may contain blocks.
+                * We cannot use TAG_DIV 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_En:
                if (NULL == n->norm->Es ||
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||


@@ -1641,9 +1632,11 @@ mdoc_quote_pre(MDOC_ARGS)
                break;
        case MDOC_Do:
        case MDOC_Dq:
                break;
        case MDOC_Do:
        case MDOC_Dq:

+               print_text(h, "\\(lq");
+               break;

        case MDOC_Qo:
        case MDOC_Qq:
        case MDOC_Qo:
        case MDOC_Qq:

-               print_text(h, "\\(lq");
+               print_text(h, "\"");

                break;
        case MDOC_Po:
        case MDOC_Pq:
                break;
        case MDOC_Po:
        case MDOC_Pq:


@@ -1699,12 +1692,14 @@ mdoc_quote_post(MDOC_ARGS)
                else
                        print_text(h, n->norm->Es->child->next->string);
                break;
                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_Do:
        case MDOC_Dq:
                print_text(h, "\\(rq");
                break;

+       case MDOC_Qo:
+       case MDOC_Qq:
+               print_text(h, "\"");
+               break;

        case MDOC_Po:
        case MDOC_Pq:
                print_text(h, ")");
        case MDOC_Po:
        case MDOC_Pq:
                print_text(h, ")");


@@ -1759,3 +1754,9 @@ mdoc_eo_post(MDOC_ARGS)
        else if ( ! tail)
                h->flags &= ~HTML_NOSPACE;
 }
        else if ( ! tail)
                h->flags &= ~HTML_NOSPACE;
 }

+
+static int
+mdoc_abort_pre(MDOC_ARGS)
+{
+       abort();
+}