test inter-column spacing

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 49881ff04eccd990c3d6e9b8028352cdd62d0927..f2d97f3ee56e839b8e2d23d2bbaad9c2194ee0d4 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.253 2017/01/19 15:27:34 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.291 2017/06/24 14:38:32 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -27,6 +27,7 @@
 #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 "roff.h"
 #include "mdoc.h"
 #include "out.h"


@@ -48,6 +49,7 @@ struct        htmlmdoc {
        void            (*post)(MDOC_ARGS);
 };
 
        void            (*post)(MDOC_ARGS);
 };
 

+static char             *cond_id(const struct roff_node *);

 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);


@@ -69,6 +71,7 @@ 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_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_d1_pre(MDOC_ARGS);
 static int               mdoc_dv_pre(MDOC_ARGS);
 static int               mdoc_fa_pre(MDOC_ARGS);


@@ -106,8 +109,8 @@ 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_va_pre(MDOC_ARGS);
 static int               mdoc_sx_pre(MDOC_ARGS);
 static int               mdoc_sy_pre(MDOC_ARGS);
 static int               mdoc_va_pre(MDOC_ARGS);


@@ -115,8 +118,7 @@ static      int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_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 htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = {

        {NULL, NULL}, /* Dd */
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */
        {NULL, NULL}, /* Dd */
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */


@@ -132,9 +134,10 @@ 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_cm_pre, NULL}, /* Cm */

        {mdoc_dv_pre, NULL}, /* Dv */
        {mdoc_er_pre, NULL}, /* Er */
        {mdoc_ev_pre, NULL}, /* Ev */
        {mdoc_dv_pre, NULL}, /* Dv */
        {mdoc_er_pre, NULL}, /* Er */
        {mdoc_ev_pre, NULL}, /* Ev */


@@ -153,7 +156,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_ft_pre, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_ex_pre, NULL}, /* Rv */
        {mdoc_ft_pre, NULL}, /* Ot */
        {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 */


@@ -171,7 +174,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 */


@@ -234,27 +237,10 @@ 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"

 };
 };

+static const struct htmlmdoc *const mdocs = __mdocs - MDOC_Dd;

 
 
 /*
 
 
 /*


@@ -362,7 +348,7 @@ print_mdoc_node(MDOC_ARGS)
                return;
 
        child = 1;
                return;
 
        child = 1;

-       t = h->tags.head;
+       t = h->tag;

        n->flags &= ~NODE_ENDED;
 
        switch (n->type) {
        n->flags &= ~NODE_ENDED;
 
        switch (n->type) {


@@ -374,9 +360,9 @@ print_mdoc_node(MDOC_ARGS)
                 * Make sure that if we're in a literal mode already
                 * (i.e., within a <PRE>) don't print the newline.
                 */
                 * 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 (*n->string == ' ' && n->flags & NODE_LINE &&
+                   (h->flags & (HTML_LITERAL | HTML_NONEWLINE)) == 0)
+                       print_otag(h, TAG_BR, "");

                if (NODE_DELIMC & n->flags)
                        h->flags |= HTML_NOSPACE;
                print_text(h, n->string);
                if (NODE_DELIMC & n->flags)
                        h->flags |= HTML_NOSPACE;
                print_text(h, n->string);


@@ -402,10 +388,17 @@ print_mdoc_node(MDOC_ARGS)
                 */
                if (h->tblt != NULL) {
                        print_tblclose(h);
                 */
                if (h->tblt != NULL) {
                        print_tblclose(h);

-                       t = h->tags.head;
+                       t = h->tag;

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

-               if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))
+               if (n->tok < ROFF_MAX) {
+                       roff_html_pre(h, n);
+                       child = 0;
+                       break;
+               }
+               assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
+               if (mdocs[n->tok].pre != NULL &&
+                   (n->end == ENDBODY_NOT || n->child != NULL))

                        child = (*mdocs[n->tok].pre)(meta, n, h);
                break;
        }
                        child = (*mdocs[n->tok].pre)(meta, n, h);
                break;
        }


@@ -424,13 +417,13 @@ print_mdoc_node(MDOC_ARGS)
        case ROFFT_EQN:
                break;
        default:
        case ROFFT_EQN:
                break;
        default:

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

                        break;
                (*mdocs[n->tok].post)(meta, n, h);
                if (n->end != ENDBODY_NOT)
                        n->body->flags |= NODE_ENDED;
                        break;
                (*mdocs[n->tok].post)(meta, n, h);
                if (n->end != ENDBODY_NOT)
                        n->body->flags |= NODE_ENDED;

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

                break;
        }
 }
                break;
        }
 }


@@ -441,7 +434,6 @@ mdoc_root_post(MDOC_ARGS)
        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");


@@ -472,7 +464,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");


@@ -492,26 +483,20 @@ mdoc_root_pre(MDOC_ARGS)
        return 1;
 }
 
        return 1;
 }
 

-char *
-make_id(const struct roff_node *n)
+static char *
+cond_id(const struct roff_node *n)

 {
 {

-       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;
+       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);
+       return NULL;

 }
 
 static int
 }
 
 static int


@@ -520,22 +505,20 @@ mdoc_sh_pre(MDOC_ARGS)
        char    *id;
 
        switch (n->type) {
        char    *id;
 
        switch (n->type) {

-       case ROFFT_BLOCK:
-               return 1;
+       case ROFFT_HEAD:
+               id = html_make_id(n);
+               print_otag(h, TAG_H1, "cTi", "Sh", id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "selflink", id);
+               free(id);
+               break;

        case ROFFT_BODY:
                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;
 }
 
        return 1;
 }
 


@@ -547,27 +530,25 @@ mdoc_ss_pre(MDOC_ARGS)
        if (n->type != ROFFT_HEAD)
                return 1;
 
        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");
-
+       id = html_make_id(n);
+       print_otag(h, TAG_H2, "cTi", "Ss", id);
+       if (id != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       free(id);

        return 1;
 }
 
 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. */
+       char    *id;

 
 

-       if (MDOC_Cm == n->tok)
-               return 1;
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_B, "cTi", "Fl", id);
+       free(id);

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

-

        if (!(n->child == NULL &&
            (n->next == NULL ||
             n->next->type == ROFFT_TEXT ||
        if (!(n->child == NULL &&
            (n->next == NULL ||
             n->next->type == ROFFT_TEXT ||


@@ -577,6 +558,18 @@ mdoc_fl_pre(MDOC_ARGS)
        return 1;
 }
 
        return 1;
 }
 

+static int
+mdoc_cm_pre(MDOC_ARGS)
+{
+       char    *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_B, "cTi", "Cm", id);
+       free(id);
+       return 1;
+}
+

 static int
 mdoc_nd_pre(MDOC_ARGS)
 {
 static int
 mdoc_nd_pre(MDOC_ARGS)
 {


@@ -586,23 +579,19 @@ mdoc_nd_pre(MDOC_ARGS)
        /* XXX: this tag in theory can contain block elements. */
 
        print_text(h, "\\(em");
        /* XXX: this tag in theory can contain block elements. */
 
        print_text(h, "\\(em");

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

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

-       int              len;
-

        switch (n->type) {
        case ROFFT_HEAD:
                print_otag(h, TAG_TD, "");
                /* FALLTHROUGH */
        case ROFFT_ELEM:
        switch (n->type) {
        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_B, "cT", "Nm");

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


@@ -610,20 +599,8 @@ mdoc_nm_pre(MDOC_ARGS)
        default:
                break;
        }
        default:
                break;
        }

-

        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,11 +612,11 @@ mdoc_xr_pre(MDOC_ARGS)
                return 0;
 
        if (h->base_man)
                return 0;
 
        if (h->base_man)

-               print_otag(h, TAG_A, "chM", "link-man",
+               print_otag(h, TAG_A, "cThM", "Xr",

                    n->child->string, n->child->next == NULL ?
                    NULL : n->child->next->string);
        else
                    n->child->string, n->child->next == NULL ?
                    NULL : n->child->next->string);
        else

-               print_otag(h, TAG_A, "c", "link-man");
+               print_otag(h, TAG_A, "cT", "Xr");

 
        n = n->child;
        print_text(h, n->string);
 
        n = n->child;
        print_text(h, n->string);


@@ -668,89 +645,151 @@ 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, "cT", "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;
+       struct tag              *t;
+       const char              *cattr;
+       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:
+               cattr = "It-bullet";
+               break;
+       case LIST_dash:
+       case LIST_hyphen:
+               cattr = "It-dash";
+               break;
+       case LIST_item:
+               cattr = "It-item";
+               break;
+       case LIST_enum:
+               cattr = "It-enum";
+               break;
+       case LIST_diag:
+               cattr = "It-diag";
+               break;
+       case LIST_hang:
+               cattr = "It-hang";
+               break;
+       case LIST_inset:
+               cattr = "It-inset";
+               break;
+       case LIST_ohang:
+               cattr = "It-ohang";
+               break;
+       case LIST_tag:
+               cattr = "It-tag";
+               break;
+       case LIST_column:
+               cattr = "It-column";
+               break;
+       default:
+               break;
+       }
+
+       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:
+                       if (bl->norm->Bl.comp)
+                               print_otag(h, TAG_LI, "csvt", cattr, 0);
+                       else
+                               print_otag(h, TAG_LI, "c", cattr);

                        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:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       if (bl->norm->Bl.comp)
+                               print_otag(h, TAG_DT, "csvt", cattr, 0);
+                       else
+                               print_otag(h, TAG_DT, "c", cattr);
+                       if (type == LIST_diag)
+                               print_otag(h, TAG_B, "c", cattr);

                        break;
                        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;
+               case ROFFT_BODY:
+                       print_otag(h, TAG_DD, "cswl", cattr,
+                           bl->norm->Bl.width);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case LIST_tag:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       if (h->style != NULL && !bl->norm->Bl.comp &&
+                           (n->parent->prev == NULL ||
+                            n->parent->prev->body == NULL ||
+                            n->parent->prev->body->child != NULL)) {
+                               t = print_otag(h, TAG_DT, "csw+-l",
+                                   cattr, bl->norm->Bl.width);
+                               print_text(h, "\\ ");
+                               print_tagq(h, t);
+                               t = print_otag(h, TAG_DD, "c", cattr);
+                               print_text(h, "\\ ");
+                               print_tagq(h, t);

                        }
                        }

-                       print_otag(h, TAG_DD, "cswl", lists[type],
+                       print_otag(h, TAG_DT, "csw+-l", cattr,

                            bl->norm->Bl.width);
                        break;
                            bl->norm->Bl.width);
                        break;

-               case LIST_column:
-                       print_otag(h, TAG_TD, "csvt", lists[type],
-                           !bl->norm->Bl.comp);
+               case ROFFT_BODY:
+                       if (n->child == NULL) {
+                               print_otag(h, TAG_DD, "css?", cattr,
+                                   "width", "auto");
+                               print_text(h, "\\ ");
+                       } else
+                               print_otag(h, TAG_DD, "c", cattr);

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

-       } else {
-               switch (type) {
-               case LIST_column:
-                       print_otag(h, TAG_TR, "c", lists[type]);
+               break;
+       case LIST_column:
+               switch (n->type) {
+               case ROFFT_HEAD:

                        break;
                        break;

-               default:
+               case ROFFT_BODY:
+                       if (bl->norm->Bl.comp)
+                               print_otag(h, TAG_TD, "csvt", cattr, 0);
+                       else
+                               print_otag(h, TAG_TD, "c", cattr);

                        break;
                        break;

+               default:
+                       print_otag(h, TAG_TR, "c", cattr);

                }
                }

+       default:
+               break;

        }
 
        return 1;
        }
 
        return 1;


@@ -759,18 +798,20 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {

-       int              i;
-       char             buf[BUFSIZ];
+       struct tag      *t;
+       struct mdoc_bl  *bl;
+       const char      *cattr;
+       size_t           i;

        enum htmltag     elemtype;
 
        enum htmltag     elemtype;
 

-       if (n->type == ROFFT_BODY) {
-               if (LIST_column == n->norm->Bl.type)
-                       print_otag(h, TAG_TBODY, "");
+       bl = &n->norm->Bl;
+
+       switch (n->type) {
+       case ROFFT_BODY:

                return 1;
                return 1;

-       }

 
 

-       if (n->type == ROFFT_HEAD) {
-               if (LIST_column != n->norm->Bl.type)
+       case ROFFT_HEAD:
+               if (bl->type != LIST_column || bl->ncols == 0)

                        return 0;
 
                /*
                        return 0;
 
                /*


@@ -780,47 +821,65 @@ mdoc_bl_pre(MDOC_ARGS)
                 * screen and we want to preserve that behaviour.
                 */
 
                 * 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]);
-
+               t = print_otag(h, TAG_COLGROUP, "");
+               for (i = 0; i < bl->ncols - 1; i++)
+                       print_otag(h, TAG_COL, "sw+w", bl->cols[i]);
+               print_otag(h, TAG_COL, "swW", bl->cols[i]);
+               print_tagq(h, t);

                return 0;
                return 0;

-       }

 
 

-       assert(lists[n->norm->Bl.type]);
-       (void)strlcpy(buf, "list ", BUFSIZ);
-       (void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
+       default:
+               break;
+       }

 
 

-       switch (n->norm->Bl.type) {
+       switch (bl->type) {

        case LIST_bullet:
        case LIST_bullet:

+               elemtype = TAG_UL;
+               cattr = "Bl-bullet";
+               break;

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

+               elemtype = TAG_UL;
+               cattr = "Bl-dash";
+               break;

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

+               cattr = "Bl-item";

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

+               cattr = "Bl-enum";

                break;
        case LIST_diag:
                break;
        case LIST_diag:

+               elemtype = TAG_DL;
+               cattr = "Bl-diag";
+               break;

        case LIST_hang:
        case LIST_hang:

+               elemtype = TAG_DL;
+               cattr = "Bl-hang";
+               break;

        case LIST_inset:
        case LIST_inset:

+               elemtype = TAG_DL;
+               cattr = "Bl-inset";
+               break;

        case LIST_ohang:
        case LIST_ohang:

-       case LIST_tag:

                elemtype = TAG_DL;
                elemtype = TAG_DL;

+               cattr = "Bl-ohang";

                break;
                break;

+       case LIST_tag:
+               cattr = "Bl-tag";
+               if (bl->offs)
+                       print_otag(h, TAG_DIV, "cswl", cattr, bl->offs);
+               print_otag(h, TAG_DL, "csw+l", cattr, bl->width);
+               return 1;

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

+               cattr = "Bl-column";

                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);
-
+       print_otag(h, elemtype, "cswl", cattr, bl->offs);

        return 1;
 }
 
        return 1;
 }
 


@@ -832,10 +891,17 @@ mdoc_ex_pre(MDOC_ARGS)
        return 1;
 }
 
        return 1;
 }
 

+static int
+mdoc_st_pre(MDOC_ARGS)
+{
+       print_otag(h, TAG_SPAN, "cT", "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(h, TAG_I, "cT", "Em");

        return 1;
 }
 
        return 1;
 }
 


@@ -845,14 +911,10 @@ mdoc_d1_pre(MDOC_ARGS)
        if (n->type != ROFFT_BLOCK)
                return 1;
 
        if (n->type != ROFFT_BLOCK)
                return 1;
 

-       print_otag(h, TAG_BLOCKQUOTE, "svtvb", 0, 0);
+       print_otag(h, TAG_DIV, "c", "D1");

 
 

-       /* BLOCKQUOTE needs a block body. */
-
-       print_otag(h, TAG_DIV, "c", "display");
-
-       if (MDOC_Dl == n->tok)
-               print_otag(h, TAG_CODE, "c", "lit");
+       if (n->tok == MDOC_Dl)
+               print_otag(h, TAG_CODE, "c", "Li");

 
        return 1;
 }
 
        return 1;
 }


@@ -862,13 +924,9 @@ mdoc_sx_pre(MDOC_ARGS)
 {
        char    *id;
 
 {
        char    *id;
 

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

        return 1;
 }
 
        return 1;
 }
 


@@ -909,15 +967,15 @@ mdoc_bd_pre(MDOC_ARGS)
                offs = -1;
 
        if (offs == -1)
                offs = -1;
 
        if (offs == -1)

-               print_otag(h, TAG_DIV, "cswl", "display", n->norm->Bd.offs);
+               print_otag(h, TAG_DIV, "cswl", "Bd", n->norm->Bd.offs);

        else
        else

-               print_otag(h, TAG_DIV, "cshl", "display", offs);
+               print_otag(h, TAG_DIV, "cshl", "Bd", offs);

 
        if (n->norm->Bd.type != DISP_unfilled &&
            n->norm->Bd.type != DISP_literal)
                return 1;
 
 
        if (n->norm->Bd.type != DISP_unfilled &&
            n->norm->Bd.type != DISP_literal)
                return 1;
 

-       print_otag(h, TAG_PRE, "c", "lit");
+       print_otag(h, TAG_PRE, "c", "Li");

 
        /* This can be recursive: save & set our literal state. */
 
 
        /* This can be recursive: save & set our literal state. */
 


@@ -933,9 +991,9 @@ mdoc_bd_pre(MDOC_ARGS)
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {

+               case ROFF_br:
+               case ROFF_sp:

                case MDOC_Sm:
                case MDOC_Sm:

-               case MDOC_br:
-               case MDOC_sp:

                case MDOC_Bl:
                case MDOC_D1:
                case MDOC_Dl:
                case MDOC_Bl:
                case MDOC_D1:
                case MDOC_Dl:


@@ -963,14 +1021,14 @@ mdoc_bd_pre(MDOC_ARGS)
 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_I, "cT", "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_I, "c", "Ad");

        return 1;
 }
 
        return 1;
 }
 


@@ -994,7 +1052,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, "cT", "An");

        return 1;
 }
 
        return 1;
 }
 


@@ -1002,28 +1060,49 @@ 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");
+       print_otag(h, TAG_B, "cT", "Cd");

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

-       print_otag(h, TAG_SPAN, "c", "define");
+       char    *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_CODE, "cTi", "Dv", id);
+       free(id);

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

-       print_otag(h, TAG_SPAN, "c", "env");
+       char    *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_CODE, "cTi", "Ev", id);
+       free(id);

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

-       print_otag(h, TAG_SPAN, "c", "errno");
+       char    *id;
+
+       id = n->sec == SEC_ERRORS &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Bq &&
+             n->parent->parent->parent->tok == MDOC_It)) ?
+           html_make_id(n) : NULL;
+
+       if (id != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_CODE, "cTi", "Er", id);
+       free(id);

        return 1;
 }
 
        return 1;
 }
 


@@ -1034,12 +1113,12 @@ 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, "cT", "Fa");

                return 1;
        }
 
        for (nn = n->child; nn; nn = nn->next) {
                return 1;
        }
 
        for (nn = n->child; nn; nn = nn->next) {

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

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


@@ -1070,11 +1149,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_B, "cT", "Fd");

                return 1;
        }
 
                return 1;
        }
 

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

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


@@ -1088,10 +1167,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, "cThI", "In", buf);

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

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

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


@@ -1118,7 +1197,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, "cT", "Vt");

        return 1;
 }
 
        return 1;
 }
 


@@ -1126,7 +1205,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, "cT", "Ft");

        return 1;
 }
 
        return 1;
 }
 


@@ -1147,7 +1226,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, "cT", "Ft");

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


@@ -1160,7 +1239,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(h, TAG_B, "cT", "Fn");

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


@@ -1173,10 +1252,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, "cTss?", "Fa",

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

-                       t = print_otag(h, TAG_I, "c", "farg");
+                       t = print_otag(h, TAG_VAR, "cT", "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) {


@@ -1228,48 +1307,40 @@ mdoc_pp_pre(MDOC_ARGS)
        return 0;
 }
 
        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;
-               }
-       } else
-               su.scale = 0.0;
-
-       print_otag(h, TAG_DIV, "suh", &su);
-
-       /* So the div isn't empty: */
-       print_text(h, "\\~");
-
-       return 0;
-
-}
-

 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
 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, "cTh", "Lk", link->string);
+       do {
+               if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+                       h->flags |= HTML_NOSPACE;
+               print_text(h, descr->string);
+               descr = descr->next;
+       } while (descr != punct);
+       print_tagq(h, t);

 
 

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

        return 0;
 }
 
        return 0;
 }
 


@@ -1283,7 +1354,7 @@ mdoc_mt_pre(MDOC_ARGS)
                assert(n->type == ROFFT_TEXT);
 
                mandoc_asprintf(&cp, "mailto:%s", n->string);
                assert(n->type == ROFFT_TEXT);
 
                mandoc_asprintf(&cp, "mailto:%s", n->string);

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

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


@@ -1311,7 +1382,7 @@ mdoc_fo_pre(MDOC_ARGS)
                return 0;
 
        assert(n->child->string);
                return 0;
 
        assert(n->child->string);

-       t = print_otag(h, TAG_B, "c", "fname");
+       t = print_otag(h, TAG_B, "cT", "Fn");

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


@@ -1335,7 +1406,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_B, "cT", "In");

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


@@ -1354,10 +1425,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, "cThI", "In", n->string);

                else
                else

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

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


@@ -1378,14 +1448,19 @@ mdoc_in_pre(MDOC_ARGS)
 static int
 mdoc_ic_pre(MDOC_ARGS)
 {
 static int
 mdoc_ic_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_B, "c", "cmd");
+       char    *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_B, "cTi", "Ic", id);
+       free(id);

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

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

        return 1;
 }
 
        return 1;
 }
 


@@ -1410,13 +1485,13 @@ mdoc_bf_pre(MDOC_ARGS)
                return 1;
 
        if (FONT_Em == n->norm->Bf.font)
                return 1;
 
        if (FONT_Em == n->norm->Bf.font)

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

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

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

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

-               cattr = "lit";
+               cattr = "Li";

        else
        else

-               cattr = "none";
+               cattr = "No";

 
        /*
         * We want this to be inline-formatted, but needs to be div to
 
        /*
         * We want this to be inline-formatted, but needs to be div to


@@ -1430,7 +1505,12 @@ mdoc_bf_pre(MDOC_ARGS)
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {

-       print_otag(h, TAG_SPAN, "c", "symb");
+       char *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_B, "cTi", "Ms", id);
+       free(id);

        return 1;
 }
 
        return 1;
 }
 


@@ -1459,28 +1539,38 @@ mdoc_rs_pre(MDOC_ARGS)
        if (n->prev && SEC_SEE_ALSO == n->sec)
                print_paragraph(h);
 
        if (n->prev && SEC_SEE_ALSO == n->sec)
                print_paragraph(h);
 

-       print_otag(h, TAG_SPAN, "c", "ref");
+       print_otag(h, TAG_CITE, "cT", "Rs");

        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");
+       char *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_SPAN, "ci", "No", id);
+       free(id);

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

-       print_otag(h, TAG_CODE, "c", "lit");
+       char    *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_CODE, "ci", "Li", id);
+       free(id);

        return 1;
 }
 
 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(h, TAG_B, "cT", "Sy");

        return 1;
 }
 
        return 1;
 }
 


@@ -1490,7 +1580,7 @@ mdoc_lb_pre(MDOC_ARGS)
        if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
                print_otag(h, TAG_BR, "");
 
        if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
                print_otag(h, TAG_BR, "");
 

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

        return 1;
 }
 
        return 1;
 }
 


@@ -1504,64 +1594,58 @@ mdoc__x_pre(MDOC_ARGS)
 
        switch (n->tok) {
        case MDOC__A:
 
        switch (n->tok) {
        case MDOC__A:

-               cattr = "ref-auth";
+               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:
                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:

-               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;
 }
 
        return 1;
 }
 


@@ -1635,7 +1719,7 @@ mdoc_quote_pre(MDOC_ARGS)
        case MDOC_Op:
                print_text(h, "\\(lB");
                h->flags |= HTML_NOSPACE;
        case MDOC_Op:
                print_text(h, "\\(lB");
                h->flags |= HTML_NOSPACE;

-               print_otag(h, TAG_SPAN, "c", "opt");
+               print_otag(h, TAG_SPAN, "c", "Op");

                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||


@@ -1656,7 +1740,7 @@ mdoc_quote_pre(MDOC_ARGS)
        case MDOC_Ql:
                print_text(h, "\\(oq");
                h->flags |= HTML_NOSPACE;
        case MDOC_Ql:
                print_text(h, "\\(oq");
                h->flags |= HTML_NOSPACE;

-               print_otag(h, TAG_CODE, "c", "lit");
+               print_otag(h, TAG_CODE, "c", "Li");

                break;
        case MDOC_So:
        case MDOC_Sq:
                break;
        case MDOC_So:
        case MDOC_Sq: