Simplify: write HTTP 303 redirects with relative locations.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 1d0c2d0e929aab51d25a5e31ebc2452b2ab61a63..27ca1a49701fa50a1a859ca05f627301394a9773 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,15 +1,15 @@
-/*     $Id: mdoc_html.c,v 1.210 2014/11/17 06:44:58 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.278 2017/03/17 12:10:16 schwarze Exp $ */

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

- * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * 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
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF


@@ -26,17 +26,17 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

+#include "roff.h"
+#include "mdoc.h"

 #include "out.h"
 #include "html.h"
 #include "out.h"
 #include "html.h"

-#include "mdoc.h"

 #include "main.h"
 
 #define        INDENT           5
 
 #include "main.h"
 
 #define        INDENT           5
 

-#define        MDOC_ARGS         const struct mdoc_meta *meta, \
-                         const struct mdoc_node *n, \
+#define        MDOC_ARGS         const struct roff_meta *meta, \
+                         struct roff_node *n, \

                          struct html *h
 
 #ifndef MIN
                          struct html *h
 
 #ifndef MIN


@@ -48,14 +48,12 @@ struct      htmlmdoc {
        void            (*post)(MDOC_ARGS);
 };
 
        void            (*post)(MDOC_ARGS);
 };
 

-static void              print_mdoc(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              synopsis_pre(struct html *,
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
 static void              synopsis_pre(struct html *,

-                               const struct mdoc_node *);
-
-static void              a2width(const char *, struct roffsu *);
+                               const struct roff_node *);

 
 static void              mdoc_root_post(MDOC_ARGS);
 static int               mdoc_root_pre(MDOC_ARGS);
 
 static void              mdoc_root_post(MDOC_ARGS);
 static int               mdoc_root_pre(MDOC_ARGS);


@@ -71,9 +69,8 @@ static        int               mdoc_bf_pre(MDOC_ARGS);
 static void              mdoc_bk_post(MDOC_ARGS);
 static int               mdoc_bk_pre(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static void              mdoc_bk_post(MDOC_ARGS);
 static int               mdoc_bk_pre(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);

-static int               mdoc_bt_pre(MDOC_ARGS);
-static int               mdoc_bx_pre(MDOC_ARGS);

 static int               mdoc_cd_pre(MDOC_ARGS);
 static int               mdoc_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);


@@ -82,6 +79,8 @@ static        int               mdoc_fl_pre(MDOC_ARGS);
 static int               mdoc_fn_pre(MDOC_ARGS);
 static int               mdoc_ft_pre(MDOC_ARGS);
 static int               mdoc_em_pre(MDOC_ARGS);
 static int               mdoc_fn_pre(MDOC_ARGS);
 static int               mdoc_ft_pre(MDOC_ARGS);
 static int               mdoc_em_pre(MDOC_ARGS);

+static void              mdoc_eo_post(MDOC_ARGS);
+static int               mdoc_eo_pre(MDOC_ARGS);

 static int               mdoc_er_pre(MDOC_ARGS);
 static int               mdoc_ev_pre(MDOC_ARGS);
 static int               mdoc_ex_pre(MDOC_ARGS);
 static int               mdoc_er_pre(MDOC_ARGS);
 static int               mdoc_ev_pre(MDOC_ARGS);
 static int               mdoc_ex_pre(MDOC_ARGS);


@@ -106,15 +105,14 @@ static    int               mdoc_pp_pre(MDOC_ARGS);
 static void              mdoc_quote_post(MDOC_ARGS);
 static int               mdoc_quote_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
 static void              mdoc_quote_post(MDOC_ARGS);
 static int               mdoc_quote_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);

-static int               mdoc_rv_pre(MDOC_ARGS);

 static int               mdoc_sh_pre(MDOC_ARGS);
 static int               mdoc_skip_pre(MDOC_ARGS);
 static int               mdoc_sm_pre(MDOC_ARGS);
 static int               mdoc_sp_pre(MDOC_ARGS);
 static int               mdoc_ss_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);
 static int               mdoc_skip_pre(MDOC_ARGS);
 static int               mdoc_sm_pre(MDOC_ARGS);
 static int               mdoc_sp_pre(MDOC_ARGS);
 static int               mdoc_ss_pre(MDOC_ARGS);

+static int               mdoc_st_pre(MDOC_ARGS);

 static int               mdoc_sx_pre(MDOC_ARGS);
 static int               mdoc_sy_pre(MDOC_ARGS);
 static int               mdoc_sx_pre(MDOC_ARGS);
 static int               mdoc_sy_pre(MDOC_ARGS);

-static int               mdoc_ud_pre(MDOC_ARGS);

 static int               mdoc_va_pre(MDOC_ARGS);
 static int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_va_pre(MDOC_ARGS);
 static int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);


@@ -139,7 +137,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_an_pre, NULL}, /* An */
        {mdoc_ar_pre, NULL}, /* Ar */
        {mdoc_cd_pre, NULL}, /* Cd */
        {mdoc_an_pre, NULL}, /* An */
        {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 */


@@ -157,8 +155,8 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_quote_pre, mdoc_quote_post}, /* Op */
        {mdoc_ft_pre, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_quote_pre, mdoc_quote_post}, /* Op */
        {mdoc_ft_pre, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */

-       {mdoc_rv_pre, NULL}, /* Rv */
-       {NULL, NULL}, /* St */
+       {mdoc_ex_pre, NULL}, /* Rv */
+       {mdoc_st_pre, NULL}, /* St */

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


@@ -176,21 +174,21 @@ 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 */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bq */
        {mdoc_xx_pre, NULL}, /* Bsx */
        {NULL, NULL}, /* Bc */
        {mdoc_bf_pre, NULL}, /* Bf */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bo */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bq */
        {mdoc_xx_pre, NULL}, /* Bsx */

-       {mdoc_bx_pre, NULL}, /* Bx */
-       {NULL, NULL}, /* Db */
+       {mdoc_xx_pre, NULL}, /* Bx */
+       {mdoc_skip_pre, NULL}, /* Db */

        {NULL, NULL}, /* Dc */
        {mdoc_quote_pre, mdoc_quote_post}, /* Do */
        {mdoc_quote_pre, mdoc_quote_post}, /* Dq */
        {NULL, NULL}, /* Ec */ /* FIXME: no space */
        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */
        {NULL, NULL}, /* Dc */
        {mdoc_quote_pre, mdoc_quote_post}, /* Do */
        {mdoc_quote_pre, mdoc_quote_post}, /* Dq */
        {NULL, NULL}, /* Ec */ /* FIXME: no space */
        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */

-       {mdoc_quote_pre, mdoc_quote_post}, /* Eo */
+       {mdoc_eo_pre, mdoc_eo_post}, /* Eo */

        {mdoc_xx_pre, NULL}, /* Fx */
        {mdoc_ms_pre, NULL}, /* Ms */
        {mdoc_no_pre, NULL}, /* No */
        {mdoc_xx_pre, NULL}, /* Fx */
        {mdoc_ms_pre, NULL}, /* Ms */
        {mdoc_no_pre, NULL}, /* No */


@@ -223,10 +221,10 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Oc */
        {mdoc_bk_pre, mdoc_bk_post}, /* Bk */
        {NULL, NULL}, /* Ek */
        {NULL, NULL}, /* Oc */
        {mdoc_bk_pre, mdoc_bk_post}, /* Bk */
        {NULL, NULL}, /* Ek */

-       {mdoc_bt_pre, NULL}, /* Bt */
+       {NULL, NULL}, /* Bt */

        {NULL, NULL}, /* Hf */
        {mdoc_em_pre, NULL}, /* Fr */
        {NULL, NULL}, /* Hf */
        {mdoc_em_pre, NULL}, /* Fr */

-       {mdoc_ud_pre, NULL}, /* Ud */
+       {NULL, NULL}, /* Ud */

        {mdoc_lb_pre, NULL}, /* Lb */
        {mdoc_pp_pre, NULL}, /* Lp */
        {mdoc_lk_pre, NULL}, /* Lk */
        {mdoc_lb_pre, NULL}, /* Lb */
        {mdoc_pp_pre, NULL}, /* Lp */
        {mdoc_lk_pre, NULL}, /* Lk */


@@ -246,73 +244,30 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_skip_pre, NULL}, /* ll */
 };
 
        {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"
-};
-
-
-void
-html_mdoc(void *arg, const struct mdoc *mdoc)
-{
-
-       print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc),
-           (struct html *)arg);
-       putchar('\n');
-}
-
-/*
- * Calculate the scaling unit passed in a `-width' argument.  This uses
- * either a native scaling unit (e.g., 1i, 2m) or the string length of
- * the value.
- */
-static void
-a2width(const char *p, struct roffsu *su)
-{
-
-       if ( ! a2roffsu(p, su, SCALE_MAX)) {
-               su->unit = SCALE_EN;
-               su->scale = html_strlen(p);
-       }
-}

 
 /*
  * 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 mdoc_node *n)
+synopsis_pre(struct html *h, const struct roff_node *n)

 {
 
 {
 

-       if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+       if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))

                return;
 
        if (n->prev->tok == n->tok &&
            MDOC_Fo != n->tok &&
            MDOC_Ft != n->tok &&
            MDOC_Fn != n->tok) {
                return;
 
        if (n->prev->tok == n->tok &&
            MDOC_Fo != n->tok &&
            MDOC_Ft != n->tok &&
            MDOC_Fn != n->tok) {

-               print_otag(h, TAG_BR, 0, NULL);
+               print_otag(h, TAG_BR, "");

                return;
        }
 
        switch (n->prev->tok) {
        case MDOC_Fd:
                return;
        }
 
        switch (n->prev->tok) {
        case MDOC_Fd:

-               /* FALLTHROUGH */

        case MDOC_Fn:
        case MDOC_Fn:

-               /* FALLTHROUGH */

        case MDOC_Fo:
        case MDOC_Fo:

-               /* FALLTHROUGH */

        case MDOC_In:
        case MDOC_In:

-               /* FALLTHROUGH */

        case MDOC_Vt:
                print_paragraph(h);
                break;
        case MDOC_Vt:
                print_paragraph(h);
                break;


@@ -323,57 +278,66 @@ synopsis_pre(struct html *h, const struct mdoc_node *n)
                }
                /* FALLTHROUGH */
        default:
                }
                /* FALLTHROUGH */
        default:

-               print_otag(h, TAG_BR, 0, NULL);
+               print_otag(h, TAG_BR, "");

                break;
        }
 }
 
                break;
        }
 }
 

-static void
-print_mdoc(MDOC_ARGS)
+void
+html_mdoc(void *arg, const struct roff_man *mdoc)

 {
 {

-       struct tag      *t, *tt;
-       struct htmlpair  tag;
+       struct html     *h;
+       struct tag      *t;

 
 

-       PAIR_CLASS_INIT(&tag, "mandoc");
+       h = (struct html *)arg;

 
 

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

                print_gen_decls(h);
                print_gen_decls(h);

-               t = print_otag(h, TAG_HTML, 0, NULL);
-               tt = print_otag(h, TAG_HEAD, 0, NULL);
-               print_mdoc_head(meta, n, h);
-               print_tagq(h, tt);
-               print_otag(h, TAG_BODY, 0, NULL);
-               print_otag(h, TAG_DIV, 1, &tag);
-       } else
-               t = print_otag(h, TAG_DIV, 1, &tag);
+               print_otag(h, TAG_HTML, "");
+               t = print_otag(h, TAG_HEAD, "");
+               print_mdoc_head(&mdoc->meta, mdoc->first->child, h);
+               print_tagq(h, t);
+               print_otag(h, TAG_BODY, "");
+       }

 
 

-       print_mdoc_nodelist(meta, n, h);
+       mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
+       t = print_otag(h, TAG_DIV, "c", "manual-text");
+       print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);

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

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

 }
 
 static void
 print_mdoc_head(MDOC_ARGS)
 {
 }
 
 static void
 print_mdoc_head(MDOC_ARGS)
 {

+       char    *cp;

 
        print_gen_head(h);
 
        print_gen_head(h);

-       bufinit(h);
-       bufcat(h, meta->title);
-       if (meta->msec)
-               bufcat_fmt(h, "(%s)", meta->msec);
-       if (meta->arch)
-               bufcat_fmt(h, " (%s)", meta->arch);

 
 

-       print_otag(h, TAG_TITLE, 0, NULL);
-       print_text(h, h->buf);
+       if (meta->arch != NULL && meta->msec != NULL)
+               mandoc_asprintf(&cp, "%s(%s) (%s)", meta->title,
+                   meta->msec, meta->arch);
+       else if (meta->msec != NULL)
+               mandoc_asprintf(&cp, "%s(%s)", meta->title, meta->msec);
+       else if (meta->arch != NULL)
+               mandoc_asprintf(&cp, "%s (%s)", meta->title, meta->arch);
+       else
+               cp = mandoc_strdup(meta->title);
+
+       print_otag(h, TAG_TITLE, "");
+       print_text(h, cp);
+       free(cp);

 }
 
 static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 
 }
 
 static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 

-       print_mdoc_node(meta, n, h);
-       if (n->next)
-               print_mdoc_nodelist(meta, n->next, h);
+       while (n != NULL) {
+               print_mdoc_node(meta, n, h);
+               n = n->next;
+       }

 }
 
 static void
 }
 
 static void


@@ -382,14 +346,15 @@ print_mdoc_node(MDOC_ARGS)
        int              child;
        struct tag      *t;
 
        int              child;
        struct tag      *t;
 

+       if (n->flags & NODE_NOPRT)
+               return;
+

        child = 1;
        child = 1;

-       t = h->tags.head;
+       t = h->tag;
+       n->flags &= ~NODE_ENDED;

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

-       case MDOC_ROOT:
-               child = mdoc_root_pre(meta, n, h);
-               break;
-       case MDOC_TEXT:
+       case ROFFT_TEXT:

                /* No tables in this mode... */
                assert(NULL == h->tblt);
 
                /* No tables in this mode... */
                assert(NULL == h->tblt);
 


@@ -397,19 +362,19 @@ 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 && MDOC_LINE & n->flags)
+               if (' ' == *n->string && NODE_LINE & n->flags)

                        if ( ! (HTML_LITERAL & h->flags))
                        if ( ! (HTML_LITERAL & h->flags))

-                               print_otag(h, TAG_BR, 0, NULL);
-               if (MDOC_DELIMC & n->flags)
+                               print_otag(h, TAG_BR, "");
+               if (NODE_DELIMC & n->flags)

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

-               if (MDOC_DELIMO & n->flags)
+               if (NODE_DELIMO & n->flags)

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

-       case MDOC_EQN:
+       case ROFFT_EQN:

                print_eqn(h, n->eqn);
                break;
                print_eqn(h, n->eqn);
                break;

-       case MDOC_TBL:
+       case ROFFT_TBL:

                /*
                 * This will take care of initialising all of the table
                 * state data for the first table, then tearing it down
                /*
                 * This will take care of initialising all of the table
                 * state data for the first table, then tearing it down


@@ -423,23 +388,19 @@ 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) {
+               if (h->tblt != NULL) {

                        print_tblclose(h);
                        print_tblclose(h);

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

                }
                }

-
-               assert(NULL == h->tblt);
-               if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
+               assert(h->tblt == NULL);
+               if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))

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

-       if (HTML_KEEP & h->flags) {
-               if (n->prev ? (n->prev->lastline != n->line) :
-                   (n->parent && n->parent->line != n->line)) {
-                       h->flags &= ~HTML_KEEP;
-                       h->flags |= HTML_PREKEEP;
-               }
+       if (h->flags & HTML_KEEP && n->flags & NODE_LINE) {
+               h->flags &= ~HTML_KEEP;
+               h->flags |= HTML_PREKEEP;

        }
 
        if (child && n->child)
        }
 
        if (child && n->child)


@@ -448,14 +409,14 @@ print_mdoc_node(MDOC_ARGS)
        print_stagq(h, t);
 
        switch (n->type) {
        print_stagq(h, t);
 
        switch (n->type) {

-       case MDOC_ROOT:
-               mdoc_root_post(meta, n, h);
-               break;
-       case MDOC_EQN:
+       case ROFFT_EQN:

                break;
        default:
                break;
        default:

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

                break;
        }
 }
                break;
        }
 }


@@ -463,23 +424,16 @@ print_mdoc_node(MDOC_ARGS)
 static void
 mdoc_root_post(MDOC_ARGS)
 {
 static void
 mdoc_root_post(MDOC_ARGS)
 {

-       struct htmlpair  tag;

        struct tag      *t, *tt;
 
        struct tag      *t, *tt;
 

-       PAIR_CLASS_INIT(&tag, "foot");
-       t = print_otag(h, TAG_TABLE, 1, &tag);
-
-       print_otag(h, TAG_TBODY, 0, NULL);
-
-       tt = print_otag(h, TAG_TR, 0, NULL);
+       t = print_otag(h, TAG_TABLE, "c", "foot");
+       tt = print_otag(h, TAG_TR, "");

 
 

-       PAIR_CLASS_INIT(&tag, "foot-date");
-       print_otag(h, TAG_TD, 1, &tag);
+       print_otag(h, TAG_TD, "c", "foot-date");

        print_text(h, meta->date);
        print_stagq(h, tt);
 
        print_text(h, meta->date);
        print_stagq(h, tt);
 

-       PAIR_CLASS_INIT(&tag, "foot-os");
-       print_otag(h, TAG_TD, 1, &tag);
+       print_otag(h, TAG_TD, "c", "foot-os");

        print_text(h, meta->os);
        print_tagq(h, t);
 }
        print_text(h, meta->os);
        print_tagq(h, t);
 }


@@ -487,7 +441,6 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
 static int
 mdoc_root_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;

        struct tag      *t, *tt;
        char            *volume, *title;
 
        struct tag      *t, *tt;
        char            *volume, *title;
 


@@ -503,212 +456,183 @@ mdoc_root_pre(MDOC_ARGS)
                mandoc_asprintf(&title, "%s(%s)",
                    meta->title, meta->msec);
 
                mandoc_asprintf(&title, "%s(%s)",
                    meta->title, meta->msec);
 

-       PAIR_CLASS_INIT(&tag, "head");
-       t = print_otag(h, TAG_TABLE, 1, &tag);
-
-       print_otag(h, TAG_TBODY, 0, NULL);
-
-       tt = print_otag(h, TAG_TR, 0, NULL);
+       t = print_otag(h, TAG_TABLE, "c", "head");
+       tt = print_otag(h, TAG_TR, "");

 
 

-       PAIR_CLASS_INIT(&tag, "head-ltitle");
-       print_otag(h, TAG_TD, 1, &tag);
+       print_otag(h, TAG_TD, "c", "head-ltitle");

        print_text(h, title);
        print_stagq(h, tt);
 
        print_text(h, title);
        print_stagq(h, tt);
 

-       PAIR_CLASS_INIT(&tag, "head-vol");
-       print_otag(h, TAG_TD, 1, &tag);
+       print_otag(h, TAG_TD, "c", "head-vol");

        print_text(h, volume);
        print_stagq(h, tt);
 
        print_text(h, volume);
        print_stagq(h, tt);
 

-       PAIR_CLASS_INIT(&tag, "head-rtitle");
-       print_otag(h, TAG_TD, 1, &tag);
+       print_otag(h, TAG_TD, "c", "head-rtitle");

        print_text(h, title);
        print_tagq(h, t);
 
        free(title);
        free(volume);
        print_text(h, title);
        print_tagq(h, t);
 
        free(title);
        free(volume);

-       return(1);
+       return 1;
+}
+
+static char *
+cond_id(const struct roff_node *n)
+{
+       if (n->child != NULL &&
+           n->child->type == ROFFT_TEXT &&
+           (n->prev == NULL ||
+            (n->prev->type == ROFFT_TEXT &&
+             strcmp(n->prev->string, "|") == 0)) &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Xo &&
+             n->parent->parent->prev == NULL &&
+             n->parent->parent->parent->tok == MDOC_It)))
+               return html_make_id(n);
+       return NULL;

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

-       struct htmlpair  tag;
+       char    *id;

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

-       case MDOC_BLOCK:
-               PAIR_CLASS_INIT(&tag, "section");
-               print_otag(h, TAG_DIV, 1, &tag);
-               return(1);
-       case MDOC_BODY:
+       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);
                if (n->sec == SEC_AUTHORS)
                        h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);

-               return(1);
+               break;

        default:
                break;
        }
        default:
                break;
        }

-
-       bufinit(h);
-       bufcat(h, "x");
-
-       for (n = n->child; n && MDOC_TEXT == n->type; ) {
-               bufcat_id(h, n->string);
-               if (NULL != (n = n->next))
-                       bufcat_id(h, " ");
-       }
-
-       if (NULL == n) {
-               PAIR_ID_INIT(&tag, h->buf);
-               print_otag(h, TAG_H1, 1, &tag);
-       } else
-               print_otag(h, TAG_H1, 0, NULL);
-
-       return(1);
+       return 1;

 }
 
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;
-
-       if (MDOC_BLOCK == n->type) {
-               PAIR_CLASS_INIT(&tag, "subsection");
-               print_otag(h, TAG_DIV, 1, &tag);
-               return(1);
-       } else if (MDOC_BODY == n->type)
-               return(1);
+       char    *id;

 
 

-       bufinit(h);
-       bufcat(h, "x");
+       if (n->type != ROFFT_HEAD)
+               return 1;

 
 

-       for (n = n->child; n && MDOC_TEXT == n->type; ) {
-               bufcat_id(h, n->string);
-               if (NULL != (n = n->next))
-                       bufcat_id(h, " ");
-       }
-
-       if (NULL == n) {
-               PAIR_ID_INIT(&tag, h->buf);
-               print_otag(h, TAG_H2, 1, &tag);
-       } else
-               print_otag(h, TAG_H2, 0, NULL);
-
-       return(1);
+       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)
 {
 }
 
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;
-
-       PAIR_CLASS_INIT(&tag, "flag");
-       print_otag(h, TAG_B, 1, &tag);
-
-       /* `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->nchild == 0 &&
+       if (!(n->child == NULL &&

            (n->next == NULL ||
            (n->next == NULL ||

-            n->next->type == MDOC_TEXT ||
-            n->next->flags & MDOC_LINE)))
+            n->next->type == ROFFT_TEXT ||
+            n->next->flags & NODE_LINE)))

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

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int

-mdoc_nd_pre(MDOC_ARGS)
+mdoc_cm_pre(MDOC_ARGS)

 {
 {

-       struct htmlpair  tag;
+       char    *id;

 
 

-       if (MDOC_BODY != n->type)
-               return(1);
+       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)
+{
+       if (n->type != ROFFT_BODY)
+               return 1;

 
        /* 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");

-       PAIR_CLASS_INIT(&tag, "desc");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_SPAN, "cT", "Nd");
+       return 1;

 }
 
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;
-       struct roffsu    su;
+       struct tag      *t;

        int              len;
 
        switch (n->type) {
        int              len;
 
        switch (n->type) {

-       case MDOC_ELEM:
-               synopsis_pre(h, n);
-               PAIR_CLASS_INIT(&tag, "name");
-               print_otag(h, TAG_B, 1, &tag);
-               if (NULL == n->child && meta->name)
-                       print_text(h, meta->name);
-               return(1);
-       case MDOC_HEAD:
-               print_otag(h, TAG_TD, 0, NULL);
-               if (NULL == n->child && meta->name)
-                       print_text(h, meta->name);
-               return(1);
-       case MDOC_BODY:
-               print_otag(h, TAG_TD, 0, NULL);
-               return(1);
+       case ROFFT_HEAD:
+               print_otag(h, TAG_TD, "");
+               /* FALLTHROUGH */
+       case ROFFT_ELEM:
+               print_otag(h, TAG_B, "cT", "Nm");
+               return 1;
+       case ROFFT_BODY:
+               print_otag(h, TAG_TD, "");
+               return 1;

        default:
                break;
        }
 
        synopsis_pre(h, n);
        default:
                break;
        }
 
        synopsis_pre(h, n);

-       PAIR_CLASS_INIT(&tag, "synopsis");
-       print_otag(h, TAG_TABLE, 1, &tag);
+       print_otag(h, TAG_TABLE, "c", "Nm");

 
 

-       for (len = 0, n = n->child; n; n = n->next)
-               if (MDOC_TEXT == n->type)
+       for (len = 0, n = n->head->child; n; n = n->next)
+               if (n->type == ROFFT_TEXT)

                        len += html_strlen(n->string);
 
                        len += html_strlen(n->string);
 

-       if (0 == len && meta->name)
+       if (len == 0 && meta->name != NULL)

                len = html_strlen(meta->name);
 
                len = html_strlen(meta->name);
 

-       SCALE_HS_INIT(&su, len);
-       bufinit(h);
-       bufcat_su(h, "width", &su);
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_COL, 1, &tag);
-       print_otag(h, TAG_COL, 0, NULL);
-       print_otag(h, TAG_TBODY, 0, NULL);
-       print_otag(h, TAG_TR, 0, NULL);
-       return(1);
+       t = print_otag(h, TAG_COLGROUP, "");
+       /* Increase width to make even bold text fit. */
+       print_otag(h, TAG_COL, "shw", len + 2);
+       print_otag(h, TAG_COL, "");
+       print_tagq(h, t);
+       print_otag(h, TAG_TR, "");
+       return 1;

 }
 
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag[2];
-

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

-               return(0);
-
-       PAIR_CLASS_INIT(&tag[0], "link-man");
+               return 0;

 
 

-       if (h->base_man) {
-               buffmt_man(h, n->child->string,
-                   n->child->next ?
-                   n->child->next->string : NULL);
-               PAIR_HREF_INIT(&tag[1], h->buf);
-               print_otag(h, TAG_A, 2, tag);
-       } else
-               print_otag(h, TAG_A, 1, tag);
+       if (h->base_man)
+               print_otag(h, TAG_A, "cThM", "Xr",
+                   n->child->string, n->child->next == NULL ?
+                   NULL : n->child->next->string);
+       else
+               print_otag(h, TAG_A, "cT", "Xr");

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

-               return(0);
+               return 0;

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


@@ -716,227 +640,189 @@ mdoc_xr_pre(MDOC_ARGS)
        print_text(h, n->string);
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");
        print_text(h, n->string);
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");

-       return(0);
+       return 0;

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

-       if ( ! (MDOC_LINE & n->flags))
+       if ( ! (NODE_LINE & n->flags))

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

-       return(1);
+       return 1;

 }
 
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-
-       PAIR_CLASS_INIT(&tag, "arg");
-       print_otag(h, TAG_I, 1, &tag);
-       return(1);
+       print_otag(h, TAG_VAR, "cT", "Ar");
+       return 1;

 }
 
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {

-       const char      *pp;
-       struct htmlpair  tag;
-       int              flags;
-
-       switch (n->tok) {
-       case MDOC_Bsx:
-               pp = "BSD/OS";
-               break;
-       case MDOC_Dx:
-               pp = "DragonFly";
-               break;
-       case MDOC_Fx:
-               pp = "FreeBSD";
-               break;
-       case MDOC_Nx:
-               pp = "NetBSD";
-               break;
-       case MDOC_Ox:
-               pp = "OpenBSD";
-               break;
-       case MDOC_Ux:
-               pp = "UNIX";
-               break;
-       default:
-               return(1);
-       }
-
-       PAIR_CLASS_INIT(&tag, "unix");
-       print_otag(h, TAG_SPAN, 1, &tag);
-
-       print_text(h, pp);
-       if (n->child) {
-               flags = h->flags;
-               h->flags |= HTML_KEEP;
-               print_text(h, n->child->string);
-               h->flags = flags;
-       }
-       return(0);
-}
-
-static int
-mdoc_bx_pre(MDOC_ARGS)
-{
-       struct htmlpair  tag;
-
-       PAIR_CLASS_INIT(&tag, "unix");
-       print_otag(h, TAG_SPAN, 1, &tag);
-
-       if (NULL != (n = n->child)) {
-               print_text(h, n->string);
-               h->flags |= HTML_NOSPACE;
-               print_text(h, "BSD");
-       } else {
-               print_text(h, "BSD");
-               return(0);
-       }
-
-       if (NULL != (n = n->next)) {
-               h->flags |= HTML_NOSPACE;
-               print_text(h, "-");
-               h->flags |= HTML_NOSPACE;
-               print_text(h, n->string);
-       }
-
-       return(0);
+       print_otag(h, TAG_SPAN, "c", "Ux");
+       return 1;

 }
 
 static int
 mdoc_it_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_it_pre(MDOC_ARGS)
 {

-       struct roffsu    su;
-       enum mdoc_list   type;
-       struct htmlpair  tag[2];
-       const struct mdoc_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;
                bl = bl->parent;

-
-       assert(bl);
-

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

-       assert(lists[type]);
-       PAIR_CLASS_INIT(&tag[0], lists[type]);
-
-       bufinit(h);
-
-       if (MDOC_HEAD == n->type) {
-               switch (type) {
-               case LIST_bullet:
-                       /* FALLTHROUGH */
-               case LIST_dash:
-                       /* FALLTHROUGH */
-               case LIST_item:
-                       /* FALLTHROUGH */
-               case LIST_hyphen:
-                       /* FALLTHROUGH */
-               case LIST_enum:
-                       return(0);
-               case LIST_diag:
-                       /* FALLTHROUGH */
-               case LIST_hang:
-                       /* FALLTHROUGH */
-               case LIST_inset:
-                       /* FALLTHROUGH */
-               case LIST_ohang:
-                       /* FALLTHROUGH */
-               case LIST_tag:
-                       SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
-                       bufcat_su(h, "margin-top", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_DT, 2, tag);
-                       if (LIST_diag != type)
-                               break;
-                       PAIR_CLASS_INIT(&tag[0], "diag");
-                       print_otag(h, TAG_B, 1, tag);
-                       break;
-               case LIST_column:
+       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;
+               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 (MDOC_BODY == n->type) {
-               switch (type) {
-               case LIST_bullet:
-                       /* FALLTHROUGH */
-               case LIST_hyphen:
-                       /* FALLTHROUGH */
-               case LIST_dash:
-                       /* FALLTHROUGH */
-               case LIST_enum:
-                       /* FALLTHROUGH */
-               case LIST_item:
-                       SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
-                       bufcat_su(h, "margin-top", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_LI, 2, tag);
+               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:
-                       /* FALLTHROUGH */
-               case LIST_hang:
-                       /* FALLTHROUGH */
-               case LIST_inset:
-                       /* FALLTHROUGH */
-               case LIST_ohang:
-                       /* FALLTHROUGH */
-               case LIST_tag:
-                       if (NULL == bl->norm->Bl.width) {
-                               print_otag(h, TAG_DD, 1, tag);
-                               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, "csWl",
+                                   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);

                        }
                        }

-                       a2width(bl->norm->Bl.width, &su);
-                       bufcat_su(h, "margin-left", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_DD, 2, tag);
+                       print_otag(h, TAG_DT, "csWl", cattr,
+                           bl->norm->Bl.width);

                        break;
                        break;

-               case LIST_column:
-                       SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
-                       bufcat_su(h, "margin-top", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_TD, 2, tag);
+               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, 1, tag);
+               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;

 }
 
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {

-       int              i;
-       struct htmlpair  tag[3];
-       struct roffsu    su;
-       char             buf[BUFSIZ];
+       struct tag      *t;
+       struct mdoc_bl  *bl;
+       const char      *cattr;
+       size_t           i;
+       enum htmltag     elemtype;

 
 

-       if (MDOC_BODY == n->type) {
-               if (LIST_column == n->norm->Bl.type)
-                       print_otag(h, TAG_TBODY, 0, NULL);
-               return(1);
-       }
+       bl = &n->norm->Bl;

 
 

-       if (MDOC_HEAD == n->type) {
-               if (LIST_column != n->norm->Bl.type)
-                       return(0);
+       switch (n->type) {
+       case ROFFT_BODY:
+               return 1;
+
+       case ROFFT_HEAD:
+               if (bl->type != LIST_column || bl->ncols == 0)
+                       return 0;

 
                /*
                 * For each column, print out the <COL> tag with our
 
                /*
                 * For each column, print out the <COL> tag with our


@@ -945,189 +831,128 @@ 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; i++) {
-                       bufinit(h);
-                       a2width(n->norm->Bl.cols[i], &su);
-                       if (i < (int)n->norm->Bl.ncols - 1)
-                               bufcat_su(h, "width", &su);
-                       else
-                               bufcat_su(h, "min-width", &su);
-                       PAIR_STYLE_INIT(&tag[0], h);
-                       print_otag(h, TAG_COL, 1, tag);
-               }
-
-               return(0);
-       }
-
-       SCALE_VS_INIT(&su, 0);
-       bufinit(h);
-       bufcat_su(h, "margin-top", &su);
-       bufcat_su(h, "margin-bottom", &su);
-       PAIR_STYLE_INIT(&tag[0], h);
-
-       assert(lists[n->norm->Bl.type]);
-       (void)strlcpy(buf, "list ", BUFSIZ);
-       (void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
-       PAIR_INIT(&tag[1], ATTR_CLASS, buf);
-
-       /* Set the block's left-hand margin. */
+               t = print_otag(h, TAG_COLGROUP, "");
+               for (i = 0; i < bl->ncols - 1; i++)
+                       print_otag(h, TAG_COL, "sww", bl->cols[i]);
+               print_otag(h, TAG_COL, "swW", bl->cols[i]);
+               print_tagq(h, t);
+               return 0;

 
 

-       if (n->norm->Bl.offs) {
-               a2width(n->norm->Bl.offs, &su);
-               bufcat_su(h, "margin-left", &su);
+       default:
+               break;

        }
 
        }
 

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

        case LIST_bullet:
        case LIST_bullet:

-               /* FALLTHROUGH */
+               elemtype = TAG_UL;
+               cattr = "Bl-bullet";
+               break;

        case LIST_dash:
        case LIST_dash:

-               /* FALLTHROUGH */

        case LIST_hyphen:
        case LIST_hyphen:

-               /* FALLTHROUGH */
+               elemtype = TAG_UL;
+               cattr = "Bl-dash";
+               break;

        case LIST_item:
        case LIST_item:

-               print_otag(h, TAG_UL, 2, tag);
+               elemtype = TAG_UL;
+               cattr = "Bl-item";

                break;
        case LIST_enum:
                break;
        case LIST_enum:

-               print_otag(h, TAG_OL, 2, tag);
+               elemtype = TAG_OL;
+               cattr = "Bl-enum";

                break;
        case LIST_diag:
                break;
        case LIST_diag:

-               /* FALLTHROUGH */
+               elemtype = TAG_DL;
+               cattr = "Bl-diag";
+               break;

        case LIST_hang:
        case LIST_hang:

-               /* FALLTHROUGH */
+               elemtype = TAG_DL;
+               cattr = "Bl-hang";
+               break;

        case LIST_inset:
        case LIST_inset:

-               /* FALLTHROUGH */
+               elemtype = TAG_DL;
+               cattr = "Bl-inset";
+               break;

        case LIST_ohang:
        case LIST_ohang:

-               /* FALLTHROUGH */
-       case LIST_tag:
-               print_otag(h, TAG_DL, 2, tag);
+               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, "cswl", cattr, bl->width);
+               return 1;

        case LIST_column:
        case LIST_column:

-               print_otag(h, TAG_TABLE, 2, tag);
+               elemtype = TAG_TABLE;
+               cattr = "Bl-column";

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

-               /* NOTREACHED */

        }
        }

-
-       return(1);
+       print_otag(h, elemtype, "cswl", cattr, bl->offs);
+       return 1;

 }
 
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {

-       struct tag      *t;
-       struct htmlpair  tag;
-       int              nchild;
-

        if (n->prev)
        if (n->prev)

-               print_otag(h, TAG_BR, 0, NULL);
-
-       PAIR_CLASS_INIT(&tag, "utility");
-
-       print_text(h, "The");
-
-       nchild = n->nchild;
-       for (n = n->child; n; n = n->next) {
-               assert(MDOC_TEXT == n->type);
-
-               t = print_otag(h, TAG_B, 1, &tag);
-               print_text(h, n->string);
-               print_tagq(h, t);
-
-               if (nchild > 2 && n->next) {
-                       h->flags |= HTML_NOSPACE;
-                       print_text(h, ",");
-               }
-
-               if (n->next && NULL == n->next->next)
-                       print_text(h, "and");
-       }
-
-       if (nchild > 1)
-               print_text(h, "utilities exit\\~0");
-       else
-               print_text(h, "utility exits\\~0");
+               print_otag(h, TAG_BR, "");
+       return 1;
+}

 
 

-       print_text(h, "on success, and\\~>0 if an error occurs.");
-       return(0);
+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)
 {

-       struct htmlpair tag;
-
-       PAIR_CLASS_INIT(&tag, "emph");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_I, "cT", "Em");
+       return 1;

 }
 
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag[2];
-       struct roffsu    su;
+       if (n->type != ROFFT_BLOCK)
+               return 1;

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
+       print_otag(h, TAG_DIV, "c", "D1");

 
 

-       SCALE_VS_INIT(&su, 0);
-       bufinit(h);
-       bufcat_su(h, "margin-top", &su);
-       bufcat_su(h, "margin-bottom", &su);
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_BLOCKQUOTE, 1, tag);
+       if (n->tok == MDOC_Dl)
+               print_otag(h, TAG_CODE, "c", "Li");

 
 

-       /* BLOCKQUOTE needs a block body. */
-
-       PAIR_CLASS_INIT(&tag[0], "display");
-       print_otag(h, TAG_DIV, 1, tag);
-
-       if (MDOC_Dl == n->tok) {
-               PAIR_CLASS_INIT(&tag[0], "lit");
-               print_otag(h, TAG_CODE, 1, tag);
-       }
-
-       return(1);
+       return 1;

 }
 
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag[2];
-
-       bufinit(h);
-       bufcat(h, "#x");
-
-       for (n = n->child; n; ) {
-               bufcat_id(h, n->string);
-               if (NULL != (n = n->next))
-                       bufcat_id(h, " ");
-       }
-
-       PAIR_CLASS_INIT(&tag[0], "link-sec");
-       PAIR_HREF_INIT(&tag[1], h->buf);
+       char    *id;

 
 

-       print_otag(h, TAG_I, 1, tag);
-       print_otag(h, TAG_A, 2, tag);
-       return(1);
+       id = html_make_id(n);
+       print_otag(h, TAG_A, "cThR", "Sx", id);
+       free(id);
+       return 1;

 }
 
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {

-       struct htmlpair          tag[2];
-       int                      comp, sv;
-       const struct mdoc_node  *nn;
-       struct roffsu            su;
+       int                      comp, offs, sv;
+       struct roff_node        *nn;

 
 

-       if (MDOC_HEAD == n->type)
-               return(0);
+       if (n->type == ROFFT_HEAD)
+               return 0;

 
 

-       if (MDOC_BLOCK == n->type) {
+       if (n->type == ROFFT_BLOCK) {

                comp = n->norm->Bd.comp;
                for (nn = n; nn && ! comp; nn = nn->parent) {
                comp = n->norm->Bd.comp;
                for (nn = n; nn && ! comp; nn = nn->parent) {

-                       if (MDOC_BLOCK != nn->type)
+                       if (nn->type != ROFFT_BLOCK)

                                continue;
                        if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
                                comp = 1;
                                continue;
                        if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
                                comp = 1;


@@ -1136,34 +961,31 @@ mdoc_bd_pre(MDOC_ARGS)
                }
                if ( ! comp)
                        print_paragraph(h);
                }
                if ( ! comp)
                        print_paragraph(h);

-               return(1);
+               return 1;

        }
 
        /* Handle the -offset argument. */
 
        if (n->norm->Bd.offs == NULL ||
            ! strcmp(n->norm->Bd.offs, "left"))
        }
 
        /* Handle the -offset argument. */
 
        if (n->norm->Bd.offs == NULL ||
            ! strcmp(n->norm->Bd.offs, "left"))

-               SCALE_HS_INIT(&su, 0);
+               offs = 0;

        else if ( ! strcmp(n->norm->Bd.offs, "indent"))
        else if ( ! strcmp(n->norm->Bd.offs, "indent"))

-               SCALE_HS_INIT(&su, INDENT);
+               offs = INDENT;

        else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
        else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))

-               SCALE_HS_INIT(&su, INDENT * 2);
+               offs = INDENT * 2;

        else
        else

-               a2width(n->norm->Bd.offs, &su);
+               offs = -1;

 
 

-       bufinit(h);
-       bufcat_su(h, "margin-left", &su);
-       PAIR_STYLE_INIT(&tag[0], h);
+       if (offs == -1)
+               print_otag(h, TAG_DIV, "cswl", "Bd", n->norm->Bd.offs);
+       else
+               print_otag(h, TAG_DIV, "cshl", "Bd", offs);

 
 

-       if (DISP_unfilled != n->norm->Bd.type &&
-           DISP_literal != n->norm->Bd.type) {
-               PAIR_CLASS_INIT(&tag[1], "display");
-               print_otag(h, TAG_DIV, 2, tag);
-               return(1);
-       }
+       if (n->norm->Bd.type != DISP_unfilled &&
+           n->norm->Bd.type != DISP_literal)
+               return 1;

 
 

-       PAIR_CLASS_INIT(&tag[1], "lit display");
-       print_otag(h, TAG_PRE, 2, tag);
+       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. */
 


@@ -1180,25 +1002,19 @@ mdoc_bd_pre(MDOC_ARGS)
                 */
                switch (nn->tok) {
                case MDOC_Sm:
                 */
                switch (nn->tok) {
                case MDOC_Sm:

-                       /* FALLTHROUGH */

                case MDOC_br:
                case MDOC_br:

-                       /* FALLTHROUGH */

                case MDOC_sp:
                case MDOC_sp:

-                       /* FALLTHROUGH */

                case MDOC_Bl:
                case MDOC_Bl:

-                       /* FALLTHROUGH */

                case MDOC_D1:
                case MDOC_D1:

-                       /* FALLTHROUGH */

                case MDOC_Dl:
                case MDOC_Dl:

-                       /* FALLTHROUGH */

                case MDOC_Lp:
                case MDOC_Lp:

-                       /* FALLTHROUGH */

                case MDOC_Pp:
                        continue;
                default:
                        break;
                }
                case MDOC_Pp:
                        continue;
                default:
                        break;
                }

-               if (nn->next && nn->next->line == nn->line)
+               if (h->flags & HTML_NONEWLINE ||
+                   (nn->next && ! (nn->next->flags & NODE_LINE)))

                        continue;
                else if (nn->next)
                        print_text(h, "\n");
                        continue;
                else if (nn->next)
                        print_text(h, "\n");


@@ -1209,115 +1025,110 @@ mdoc_bd_pre(MDOC_ARGS)
        if (0 == sv)
                h->flags &= ~HTML_LITERAL;
 
        if (0 == sv)
                h->flags &= ~HTML_LITERAL;
 

-       return(0);
+       return 0;

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

-       struct htmlpair tag;
-
-       PAIR_CLASS_INIT(&tag, "file");
-       print_otag(h, TAG_I, 1, &tag);
-       return(1);
+       print_otag(h, TAG_I, "cT", "Pa");
+       return 1;

 }
 
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-
-       PAIR_CLASS_INIT(&tag, "addr");
-       print_otag(h, TAG_I, 1, &tag);
-       return(1);
+       print_otag(h, TAG_I, "c", "Ad");
+       return 1;

 }
 
 static int
 mdoc_an_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_an_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-

        if (n->norm->An.auth == AUTH_split) {
                h->flags &= ~HTML_NOSPLIT;
                h->flags |= HTML_SPLIT;
        if (n->norm->An.auth == AUTH_split) {
                h->flags &= ~HTML_NOSPLIT;
                h->flags |= HTML_SPLIT;

-               return(0);
+               return 0;

        }
        if (n->norm->An.auth == AUTH_nosplit) {
                h->flags &= ~HTML_SPLIT;
                h->flags |= HTML_NOSPLIT;
        }
        if (n->norm->An.auth == AUTH_nosplit) {
                h->flags &= ~HTML_SPLIT;
                h->flags |= HTML_NOSPLIT;

-               return(0);
+               return 0;

        }
 
        }
 

-       if (n->child == NULL)
-               return(0);
-

        if (h->flags & HTML_SPLIT)
        if (h->flags & HTML_SPLIT)

-               print_otag(h, TAG_BR, 0, NULL);
+               print_otag(h, TAG_BR, "");

 
        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;
 

-       PAIR_CLASS_INIT(&tag, "author");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_SPAN, "cT", "An");
+       return 1;

 }
 
 static int
 mdoc_cd_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_cd_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-

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

-       PAIR_CLASS_INIT(&tag, "config");
-       print_otag(h, TAG_B, 1, &tag);
-       return(1);
+       print_otag(h, TAG_B, "cT", "Cd");
+       return 1;

 }
 
 static int
 mdoc_dv_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_dv_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       char    *id;

 
 

-       PAIR_CLASS_INIT(&tag, "define");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_CODE, "cTi", "Dv", id);
+       free(id);
+       return 1;

 }
 
 static int
 mdoc_ev_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ev_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       char    *id;

 
 

-       PAIR_CLASS_INIT(&tag, "env");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_CODE, "cTi", "Ev", id);
+       free(id);
+       return 1;

 }
 
 static int
 mdoc_er_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_er_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       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;

 
 

-       PAIR_CLASS_INIT(&tag, "errno");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if (id != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_CODE, "cTi", "Er", id);
+       free(id);
+       return 1;

 }
 
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {

-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
+       const struct roff_node  *nn;

        struct tag              *t;
 
        struct tag              *t;
 

-       PAIR_CLASS_INIT(&tag, "farg");

        if (n->parent->tok != MDOC_Fo) {
        if (n->parent->tok != MDOC_Fo) {

-               print_otag(h, TAG_I, 1, &tag);
-               return(1);
+               print_otag(h, TAG_VAR, "cT", "Fa");
+               return 1;

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

-               t = print_otag(h, TAG_I, 1, &tag);
+               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) {


@@ -1331,63 +1142,46 @@ mdoc_fa_pre(MDOC_ARGS)
                print_text(h, ",");
        }
 
                print_text(h, ",");
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag[2];
-       char             buf[BUFSIZ];
-       size_t           sz;
-       int              i;

        struct tag      *t;
        struct tag      *t;

+       char            *buf, *cp;

 
        synopsis_pre(h, n);
 
        if (NULL == (n = n->child))
 
        synopsis_pre(h, n);
 
        if (NULL == (n = n->child))

-               return(0);
+               return 0;

 
 

-       assert(MDOC_TEXT == n->type);
+       assert(n->type == ROFFT_TEXT);

 
        if (strcmp(n->string, "#include")) {
 
        if (strcmp(n->string, "#include")) {

-               PAIR_CLASS_INIT(&tag[0], "macro");
-               print_otag(h, TAG_B, 1, tag);
-               return(1);
+               print_otag(h, TAG_B, "cT", "Fd");
+               return 1;

        }
 
        }
 

-       PAIR_CLASS_INIT(&tag[0], "includes");
-       print_otag(h, TAG_B, 1, tag);
+       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)) {

-               assert(MDOC_TEXT == n->type);
-
-               /*
-                * XXX This is broken and not easy to fix.
-                * When using -Oincludes, truncation may occur.
-                * Dynamic allocation wouldn't help because
-                * passing long strings to buffmt_includes()
-                * does not work either.
-                */
+               assert(n->type == ROFFT_TEXT);

 
 

-               strlcpy(buf, '<' == *n->string || '"' == *n->string ?
-                   n->string + 1 : n->string, BUFSIZ);
-
-               sz = strlen(buf);
-               if (sz && ('>' == buf[sz - 1] || '"' == buf[sz - 1]))
-                       buf[sz - 1] = '\0';
-
-               PAIR_CLASS_INIT(&tag[0], "link-includes");
-
-               i = 1;

                if (h->base_includes) {
                if (h->base_includes) {

-                       buffmt_includes(h, buf);
-                       PAIR_HREF_INIT(&tag[i], h->buf);
-                       i++;
-               }
+                       cp = n->string;
+                       if (*cp == '<' || *cp == '"')
+                               cp++;
+                       buf = mandoc_strdup(cp);
+                       cp = strchr(buf, '\0') - 1;
+                       if (cp >= buf && (*cp == '>' || *cp == '"'))
+                               *cp = '\0';
+                       t = print_otag(h, TAG_A, "cThI", "In", buf);
+                       free(buf);
+               } else
+                       t = print_otag(h, TAG_A, "cT", "In");

 
 

-               t = print_otag(h, TAG_A, i, tag);

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


@@ -1395,52 +1189,45 @@ mdoc_fd_pre(MDOC_ARGS)
        }
 
        for ( ; n; n = n->next) {
        }
 
        for ( ; n; n = n->next) {

-               assert(MDOC_TEXT == n->type);
+               assert(n->type == ROFFT_TEXT);

                print_text(h, n->string);
        }
 
                print_text(h, n->string);
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;
-
-       if (MDOC_BLOCK == n->type) {
+       if (n->type == ROFFT_BLOCK) {

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

-               return(1);
-       } else if (MDOC_ELEM == n->type) {
+               return 1;
+       } else if (n->type == ROFFT_ELEM) {

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

-       } else if (MDOC_HEAD == n->type)
-               return(0);
+       } else if (n->type == ROFFT_HEAD)
+               return 0;

 
 

-       PAIR_CLASS_INIT(&tag, "type");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_VAR, "cT", "Vt");
+       return 1;

 }
 
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;
-

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

-       PAIR_CLASS_INIT(&tag, "ftype");
-       print_otag(h, TAG_I, 1, &tag);
-       return(1);
+       print_otag(h, TAG_VAR, "cT", "Ft");
+       return 1;

 }
 
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {
        struct tag      *t;
 }
 
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {
        struct tag      *t;

-       struct htmlpair  tag[2];

        char             nbuf[BUFSIZ];
        const char      *sp, *ep;
        char             nbuf[BUFSIZ];
        const char      *sp, *ep;

-       int              sz, i, pretty;
+       int              sz, pretty;

 
 

-       pretty = MDOC_SYNPRETTY & n->flags;
+       pretty = NODE_SYNPRETTY & n->flags;

        synopsis_pre(h, n);
 
        /* Split apart into type and name. */
        synopsis_pre(h, n);
 
        /* Split apart into type and name. */


@@ -1449,8 +1236,7 @@ mdoc_fn_pre(MDOC_ARGS)
 
        ep = strchr(sp, ' ');
        if (NULL != ep) {
 
        ep = strchr(sp, ' ');
        if (NULL != ep) {

-               PAIR_CLASS_INIT(&tag[0], "ftype");
-               t = print_otag(h, TAG_I, 1, tag);
+               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);


@@ -1463,25 +1249,7 @@ mdoc_fn_pre(MDOC_ARGS)
                print_tagq(h, t);
        }
 
                print_tagq(h, t);
        }
 

-       PAIR_CLASS_INIT(&tag[0], "fname");
-
-       /*
-        * FIXME: only refer to IDs that we know exist.
-        */
-
-#if 0
-       if (MDOC_SYNPRETTY & n->flags) {
-               nbuf[0] = '\0';
-               html_idcat(nbuf, sp, BUFSIZ);
-               PAIR_ID_INIT(&tag[1], nbuf);
-       } else {
-               strlcpy(nbuf, "#", BUFSIZ);
-               html_idcat(nbuf, sp, BUFSIZ);
-               PAIR_HREF_INIT(&tag[1], nbuf);
-       }
-#endif
-
-       t = print_otag(h, TAG_B, 1, tag);
+       t = print_otag(h, TAG_B, "cT", "Fn");

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


@@ -1492,16 +1260,12 @@ mdoc_fn_pre(MDOC_ARGS)
        print_text(h, "(");
        h->flags |= HTML_NOSPACE;
 
        print_text(h, "(");
        h->flags |= HTML_NOSPACE;
 

-       PAIR_CLASS_INIT(&tag[0], "farg");
-       bufinit(h);
-       bufcat_style(h, "white-space", "nowrap");
-       PAIR_STYLE_INIT(&tag[1], h);
-

        for (n = n->child->next; n; n = n->next) {
        for (n = n->child->next; n; n = n->next) {

-               i = 1;
-               if (MDOC_SYNPRETTY & n->flags)
-                       i = 2;
-               t = print_otag(h, TAG_I, i, tag);
+               if (NODE_SYNPRETTY & n->flags)
+                       t = print_otag(h, TAG_VAR, "cTss?", "Fa",
+                           "white-space", "nowrap");
+               else
+                       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) {


@@ -1518,7 +1282,7 @@ mdoc_fn_pre(MDOC_ARGS)
                print_text(h, ";");
        }
 
                print_text(h, ";");
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1535,14 +1299,14 @@ mdoc_sm_pre(MDOC_ARGS)
        if ( ! (HTML_NONOSPACE & h->flags))
                h->flags &= ~HTML_NOSPACE;
 
        if ( ! (HTML_NONOSPACE & h->flags))
                h->flags &= ~HTML_NOSPACE;
 

-       return(0);
+       return 0;

 }
 
 static int
 mdoc_skip_pre(MDOC_ARGS)
 {
 
 }
 
 static int
 mdoc_skip_pre(MDOC_ARGS)
 {
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1550,50 +1314,44 @@ mdoc_pp_pre(MDOC_ARGS)
 {
 
        print_paragraph(h);
 {
 
        print_paragraph(h);

-       return(0);
+       return 0;

 }
 
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
        struct roffsu    su;
 }
 
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
        struct roffsu    su;

-       struct htmlpair  tag;

 
        SCALE_VS_INIT(&su, 1);
 
        if (MDOC_sp == n->tok) {
 
        SCALE_VS_INIT(&su, 1);
 
        if (MDOC_sp == n->tok) {

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

                        if ( ! a2roffsu(n->string, &su, SCALE_VS))
                        if ( ! a2roffsu(n->string, &su, SCALE_VS))

-                               SCALE_VS_INIT(&su, atoi(n->string));
+                               su.scale = 1.0;
+                       else if (su.scale < 0.0)
+                               su.scale = 0.0;
+               }

        } else
                su.scale = 0.0;
 
        } else
                su.scale = 0.0;
 

-       bufinit(h);
-       bufcat_su(h, "height", &su);
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, 1, &tag);
+       print_otag(h, TAG_DIV, "suh", &su);

 
        /* So the div isn't empty: */
        print_text(h, "\\~");
 
 
        /* So the div isn't empty: */
        print_text(h, "\\~");
 

-       return(0);
+       return 0;

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

-       struct htmlpair  tag[2];
-

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

-               return(0);
+               return 0;

 
 

-       assert(MDOC_TEXT == n->type);
+       assert(n->type == ROFFT_TEXT);

 
 

-       PAIR_CLASS_INIT(&tag[0], "link-ext");
-       PAIR_HREF_INIT(&tag[1], n->string);
-
-       print_otag(h, TAG_A, 2, tag);
+       print_otag(h, TAG_A, "cTh", "Lk", n->string);

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


@@ -1601,66 +1359,58 @@ mdoc_lk_pre(MDOC_ARGS)
        for (n = n->next; n; n = n->next)
                print_text(h, n->string);
 
        for (n = n->next; n; n = n->next)
                print_text(h, n->string);
 

-       return(0);
+       return 0;

 }
 
 static int
 mdoc_mt_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_mt_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag[2];

        struct tag      *t;
        struct tag      *t;

-
-       PAIR_CLASS_INIT(&tag[0], "link-mail");
+       char            *cp;

 
        for (n = n->child; n; n = n->next) {
 
        for (n = n->child; n; n = n->next) {

-               assert(MDOC_TEXT == n->type);
-
-               bufinit(h);
-               bufcat(h, "mailto:");
-               bufcat(h, n->string);
+               assert(n->type == ROFFT_TEXT);

 
 

-               PAIR_HREF_INIT(&tag[1], h->buf);
-               t = print_otag(h, TAG_A, 2, tag);
+               mandoc_asprintf(&cp, "mailto:%s", n->string);
+               t = print_otag(h, TAG_A, "cTh", "Mt", cp);

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

+               free(cp);

        }
 
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;

        struct tag      *t;
 
        struct tag      *t;
 

-       if (MDOC_BODY == n->type) {
+       if (n->type == ROFFT_BODY) {

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

-               return(1);
-       } else if (MDOC_BLOCK == n->type) {
+               return 1;
+       } else if (n->type == ROFFT_BLOCK) {

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

-               return(1);
+               return 1;

        }
 
        }
 

-       /* XXX: we drop non-initial arguments as per groff. */
+       if (n->child == NULL)
+               return 0;

 
 

-       assert(n->child);

        assert(n->child->string);
        assert(n->child->string);

-
-       PAIR_CLASS_INIT(&tag, "fname");
-       t = print_otag(h, TAG_B, 1, &tag);
+       t = print_otag(h, TAG_B, "cT", "Fn");

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

-       return(0);
+       return 0;

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

-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY)

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


@@ -1672,13 +1422,9 @@ static int
 mdoc_in_pre(MDOC_ARGS)
 {
        struct tag      *t;
 mdoc_in_pre(MDOC_ARGS)
 {
        struct tag      *t;

-       struct htmlpair  tag[2];
-       int              i;

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

-
-       PAIR_CLASS_INIT(&tag[0], "includes");
-       print_otag(h, TAG_B, 1, tag);
+       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


@@ -1687,25 +1433,19 @@ mdoc_in_pre(MDOC_ARGS)
         * of no children.
         */
 
         * of no children.
         */
 

-       if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
+       if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags)

                print_text(h, "#include");
 
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 
        if (NULL != (n = n->child)) {
                print_text(h, "#include");
 
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 
        if (NULL != (n = n->child)) {

-               assert(MDOC_TEXT == n->type);
-
-               PAIR_CLASS_INIT(&tag[0], "link-includes");
-
-               i = 1;
-               if (h->base_includes) {
-                       buffmt_includes(h, n->string);
-                       PAIR_HREF_INIT(&tag[i], h->buf);
-                       i++;
-               }
+               assert(n->type == ROFFT_TEXT);

 
 

-               t = print_otag(h, TAG_A, i, tag);
+               if (h->base_includes)
+                       t = print_otag(h, TAG_A, "cThI", "In", n->string);
+               else
+                       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);
 


@@ -1716,87 +1456,30 @@ mdoc_in_pre(MDOC_ARGS)
        print_text(h, ">");
 
        for ( ; n; n = n->next) {
        print_text(h, ">");
 
        for ( ; n; n = n->next) {

-               assert(MDOC_TEXT == n->type);
+               assert(n->type == ROFFT_TEXT);

                print_text(h, n->string);
        }
 
                print_text(h, n->string);
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 mdoc_ic_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ic_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-
-       PAIR_CLASS_INIT(&tag, "cmd");
-       print_otag(h, TAG_B, 1, &tag);
-       return(1);
-}
-
-static int
-mdoc_rv_pre(MDOC_ARGS)
-{
-       struct htmlpair  tag;
-       struct tag      *t;
-       int              nchild;
-
-       if (n->prev)
-               print_otag(h, TAG_BR, 0, NULL);
-
-       PAIR_CLASS_INIT(&tag, "fname");
-
-       nchild = n->nchild;
-       if (nchild > 0) {
-               print_text(h, "The");
-
-               for (n = n->child; n; n = n->next) {
-                       t = print_otag(h, TAG_B, 1, &tag);
-                       print_text(h, n->string);
-                       print_tagq(h, t);
+       char    *id;

 
 

-                       h->flags |= HTML_NOSPACE;
-                       print_text(h, "()");
-
-                       if (n->next == NULL)
-                               continue;
-
-                       if (nchild > 2) {
-                               h->flags |= HTML_NOSPACE;
-                               print_text(h, ",");
-                       }
-                       if (n->next->next == NULL)
-                               print_text(h, "and");
-               }
-
-               if (nchild > 1)
-                       print_text(h, "functions return");
-               else
-                       print_text(h, "function returns");
-
-               print_text(h, "the value\\~0 if successful;");
-       } else
-               print_text(h, "Upon successful completion,"
-                    " the value\\~0 is returned;");
-
-       print_text(h, "otherwise the value\\~\\-1 is returned"
-          " and the global variable");
-
-       PAIR_CLASS_INIT(&tag, "var");
-       t = print_otag(h, TAG_B, 1, &tag);
-       print_text(h, "errno");
-       print_tagq(h, t);
-       print_text(h, "is set to indicate the error.");
-       return(0);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_B, "cTi", "Ic", id);
+       free(id);
+       return 1;

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

-       struct htmlpair tag;
-
-       PAIR_CLASS_INIT(&tag, "var");
-       print_otag(h, TAG_B, 1, &tag);
-       return(1);
+       print_otag(h, TAG_VAR, "cT", "Va");
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1806,51 +1489,47 @@ 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;

-       return(1);
+       return 1;

 }
 
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag[2];
-       struct roffsu    su;
+       const char      *cattr;

 
 

-       if (MDOC_HEAD == n->type)
-               return(0);
-       else if (MDOC_BODY != n->type)
-               return(1);
+       if (n->type == ROFFT_HEAD)
+               return 0;
+       else if (n->type != ROFFT_BODY)
+               return 1;

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

-               PAIR_CLASS_INIT(&tag[0], "emph");
+               cattr = "Em";

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

-               PAIR_CLASS_INIT(&tag[0], "symb");
+               cattr = "Sy";

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

-               PAIR_CLASS_INIT(&tag[0], "lit");
+               cattr = "Li";

        else
        else

-               PAIR_CLASS_INIT(&tag[0], "none");
+               cattr = "No";

 
        /*
         * We want this to be inline-formatted, but needs to be div to
         * accept block children.
         */
 
        /*
         * We want this to be inline-formatted, but needs to be div to
         * accept block children.
         */

-       bufinit(h);
-       bufcat_style(h, "display", "inline");
-       SCALE_HS_INIT(&su, 1);
-       /* Needs a left-margin for spacing. */
-       bufcat_su(h, "margin-left", &su);
-       PAIR_STYLE_INIT(&tag[1], h);
-       print_otag(h, TAG_DIV, 2, tag);
-       return(1);
+
+       print_otag(h, TAG_DIV, "css?hl", cattr, "display", "inline", 1);
+       return 1;

 }
 
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       char *id;

 
 

-       PAIR_CLASS_INIT(&tag, "symb");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);
+       print_otag(h, TAG_B, "cTi", "Ms", id);
+       free(id);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1858,162 +1537,134 @@ mdoc_igndelim_pre(MDOC_ARGS)
 {
 
        h->flags |= HTML_IGNDELIM;
 {
 
        h->flags |= HTML_IGNDELIM;

-       return(1);
+       return 1;

 }
 
 static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
 }
 
 static void
 mdoc_pf_post(MDOC_ARGS)
 {
 

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

 }
 
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {

-       struct htmlpair  tag;
-
-       if (MDOC_BLOCK != n->type)
-               return(1);
+       if (n->type != ROFFT_BLOCK)
+               return 1;

 
        if (n->prev && SEC_SEE_ALSO == n->sec)
                print_paragraph(h);
 
 
        if (n->prev && SEC_SEE_ALSO == n->sec)
                print_paragraph(h);
 

-       PAIR_CLASS_INIT(&tag, "ref");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_CITE, "cT", "Rs");
+       return 1;

 }
 
 static int
 mdoc_no_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_no_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       char *id;

 
 

-       PAIR_CLASS_INIT(&tag, "none");
-       print_otag(h, TAG_CODE, 1, &tag);
-       return(1);
+       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)
 {
 }
 
 static int
 mdoc_li_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       char    *id;

 
 

-       PAIR_CLASS_INIT(&tag, "lit");
-       print_otag(h, TAG_CODE, 1, &tag);
-       return(1);
+       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)
 {
 }
 
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-
-       PAIR_CLASS_INIT(&tag, "symb");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-static int
-mdoc_bt_pre(MDOC_ARGS)
-{
-
-       print_text(h, "is currently in beta test.");
-       return(0);
-}
-
-static int
-mdoc_ud_pre(MDOC_ARGS)
-{
-
-       print_text(h, "currently under development.");
-       return(0);
+       print_otag(h, TAG_B, "cT", "Sy");
+       return 1;

 }
 
 static int
 mdoc_lb_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc_lb_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-
-       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev)
-               print_otag(h, TAG_BR, 0, NULL);
+       if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
+               print_otag(h, TAG_BR, "");

 
 

-       PAIR_CLASS_INIT(&tag, "lib");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_SPAN, "cT", "Lb");
+       return 1;

 }
 
 static int
 mdoc__x_pre(MDOC_ARGS)
 {
 }
 
 static int
 mdoc__x_pre(MDOC_ARGS)
 {

-       struct htmlpair tag[2];
-       enum htmltag    t;
+       const char      *cattr;
+       enum htmltag     t;

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

-               PAIR_CLASS_INIT(&tag[0], "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:

-               PAIR_CLASS_INIT(&tag[0], "ref-book");

                t = TAG_I;
                t = TAG_I;

+               cattr = "RsB";

                break;
        case MDOC__C:
                break;
        case MDOC__C:

-               PAIR_CLASS_INIT(&tag[0], "ref-city");
+               cattr = "RsC";

                break;
        case MDOC__D:
                break;
        case MDOC__D:

-               PAIR_CLASS_INIT(&tag[0], "ref-date");
+               cattr = "RsD";

                break;
        case MDOC__I:
                break;
        case MDOC__I:

-               PAIR_CLASS_INIT(&tag[0], "ref-issue");

                t = TAG_I;
                t = TAG_I;

+               cattr = "RsI";

                break;
        case MDOC__J:
                break;
        case MDOC__J:

-               PAIR_CLASS_INIT(&tag[0], "ref-jrnl");

                t = TAG_I;
                t = TAG_I;

+               cattr = "RsJ";

                break;
        case MDOC__N:
                break;
        case MDOC__N:

-               PAIR_CLASS_INIT(&tag[0], "ref-num");
+               cattr = "RsN";

                break;
        case MDOC__O:
                break;
        case MDOC__O:

-               PAIR_CLASS_INIT(&tag[0], "ref-opt");
+               cattr = "RsO";

                break;
        case MDOC__P:
                break;
        case MDOC__P:

-               PAIR_CLASS_INIT(&tag[0], "ref-page");
+               cattr = "RsP";

                break;
        case MDOC__Q:
                break;
        case MDOC__Q:

-               PAIR_CLASS_INIT(&tag[0], "ref-corp");
+               cattr = "RsQ";

                break;
        case MDOC__R:
                break;
        case MDOC__R:

-               PAIR_CLASS_INIT(&tag[0], "ref-rep");
+               cattr = "RsR";

                break;
        case MDOC__T:
                break;
        case MDOC__T:

-               PAIR_CLASS_INIT(&tag[0], "ref-title");
+               cattr = "RsT";

                break;
        case MDOC__U:
                break;
        case MDOC__U:

-               PAIR_CLASS_INIT(&tag[0], "link-ref");
-               break;
+               print_otag(h, TAG_A, "ch", "RsU", n->child->string);
+               return 1;

        case MDOC__V:
        case MDOC__V:

-               PAIR_CLASS_INIT(&tag[0], "ref-vol");
+               cattr = "RsV";

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

-               /* NOTREACHED */
-       }
-
-       if (MDOC__U != n->tok) {
-               print_otag(h, t, 1, tag);
-               return(1);

        }
 
        }
 

-       PAIR_HREF_INIT(&tag[1], n->child->string);
-       print_otag(h, TAG_A, 2, tag);
-
-       return(1);
+       print_otag(h, t, "c", cattr);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -2039,167 +1690,178 @@ mdoc_bk_pre(MDOC_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                break;
                break;

-       case MDOC_HEAD:
-               return(0);
-       case MDOC_BODY:
-               if (n->parent->args || 0 == n->prev->nchild)
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               if (n->parent->args != NULL || n->prev->child == NULL)

                        h->flags |= HTML_PREKEEP;
                break;
        default:
                abort();
                        h->flags |= HTML_PREKEEP;
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        }
 

-       return(1);
+       return 1;

 }
 
 static void
 mdoc_bk_post(MDOC_ARGS)
 {
 
 }
 
 static void
 mdoc_bk_post(MDOC_ARGS)
 {
 

-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)

                h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }
 
 static int
 mdoc_quote_pre(MDOC_ARGS)
 {
                h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }
 
 static int
 mdoc_quote_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-
-       if (MDOC_BODY != n->type)
-               return(1);
+       if (n->type != ROFFT_BODY)
+               return 1;

 
        switch (n->tok) {
        case MDOC_Ao:
 
        switch (n->tok) {
        case MDOC_Ao:

-               /* FALLTHROUGH */

        case MDOC_Aq:
        case MDOC_Aq:

-               print_text(h, "\\(la");
+               print_text(h, n->child != NULL && n->child->next == NULL &&
+                   n->child->tok == MDOC_Mt ?  "<" : "\\(la");

                break;
        case MDOC_Bro:
                break;
        case MDOC_Bro:

-               /* FALLTHROUGH */

        case MDOC_Brq:
                print_text(h, "\\(lC");
                break;
        case MDOC_Bo:
        case MDOC_Brq:
                print_text(h, "\\(lC");
                break;
        case MDOC_Bo:

-               /* FALLTHROUGH */

        case MDOC_Bq:
                print_text(h, "\\(lB");
                break;
        case MDOC_Oo:
        case MDOC_Bq:
                print_text(h, "\\(lB");
                break;
        case MDOC_Oo:

-               /* FALLTHROUGH */

        case MDOC_Op:
                print_text(h, "\\(lB");
                h->flags |= HTML_NOSPACE;
        case MDOC_Op:
                print_text(h, "\\(lB");
                h->flags |= HTML_NOSPACE;

-               PAIR_CLASS_INIT(&tag, "opt");
-               print_otag(h, TAG_SPAN, 1, &tag);
+               print_otag(h, TAG_SPAN, "c", "Op");

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

-                       return(1);
+                       return 1;

                print_text(h, n->norm->Es->child->string);
                break;
                print_text(h, n->norm->Es->child->string);
                break;

-       case MDOC_Eo:
-               break;

        case MDOC_Do:
        case MDOC_Do:

-               /* FALLTHROUGH */

        case MDOC_Dq:
        case MDOC_Dq:

-               /* FALLTHROUGH */

        case MDOC_Qo:
        case MDOC_Qo:

-               /* FALLTHROUGH */

        case MDOC_Qq:
                print_text(h, "\\(lq");
                break;
        case MDOC_Po:
        case MDOC_Qq:
                print_text(h, "\\(lq");
                break;
        case MDOC_Po:

-               /* FALLTHROUGH */

        case MDOC_Pq:
                print_text(h, "(");
                break;
        case MDOC_Ql:
                print_text(h, "\\(oq");
                h->flags |= HTML_NOSPACE;
        case MDOC_Pq:
                print_text(h, "(");
                break;
        case MDOC_Ql:
                print_text(h, "\\(oq");
                h->flags |= HTML_NOSPACE;

-               PAIR_CLASS_INIT(&tag, "lit");
-               print_otag(h, TAG_CODE, 1, &tag);
+               print_otag(h, TAG_CODE, "c", "Li");

                break;
        case MDOC_So:
                break;
        case MDOC_So:

-               /* FALLTHROUGH */

        case MDOC_Sq:
                print_text(h, "\\(oq");
                break;
        default:
                abort();
        case MDOC_Sq:
                print_text(h, "\\(oq");
                break;
        default:
                abort();

-               /* NOTREACHED */

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

-       return(1);
+       return 1;

 }
 
 static void
 mdoc_quote_post(MDOC_ARGS)
 {
 
 }
 
 static void
 mdoc_quote_post(MDOC_ARGS)
 {
 

-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)

                return;
 
                return;
 

-       if (MDOC_En != n->tok)
-               h->flags |= HTML_NOSPACE;
+       h->flags |= HTML_NOSPACE;

 
        switch (n->tok) {
        case MDOC_Ao:
 
        switch (n->tok) {
        case MDOC_Ao:

-               /* FALLTHROUGH */

        case MDOC_Aq:
        case MDOC_Aq:

-               print_text(h, "\\(ra");
+               print_text(h, n->child != NULL && n->child->next == NULL &&
+                   n->child->tok == MDOC_Mt ?  ">" : "\\(ra");

                break;
        case MDOC_Bro:
                break;
        case MDOC_Bro:

-               /* FALLTHROUGH */

        case MDOC_Brq:
                print_text(h, "\\(rC");
                break;
        case MDOC_Oo:
        case MDOC_Brq:
                print_text(h, "\\(rC");
                break;
        case MDOC_Oo:

-               /* FALLTHROUGH */

        case MDOC_Op:
        case MDOC_Op:

-               /* FALLTHROUGH */

        case MDOC_Bo:
        case MDOC_Bo:

-               /* FALLTHROUGH */

        case MDOC_Bq:
                print_text(h, "\\(rB");
                break;
        case MDOC_En:
        case MDOC_Bq:
                print_text(h, "\\(rB");
                break;
        case MDOC_En:

-               if (NULL != n->norm->Es &&
-                   NULL != n->norm->Es->child &&
-                   NULL != n->norm->Es->child->next) {
-                       h->flags |= HTML_NOSPACE;
+               if (n->norm->Es == NULL ||
+                   n->norm->Es->child == NULL ||
+                   n->norm->Es->child->next == NULL)
+                       h->flags &= ~HTML_NOSPACE;
+               else

                        print_text(h, n->norm->Es->child->next->string);
                        print_text(h, n->norm->Es->child->next->string);

-               }
-               break;
-       case MDOC_Eo:

                break;
        case MDOC_Qo:
                break;
        case MDOC_Qo:

-               /* FALLTHROUGH */

        case MDOC_Qq:
        case MDOC_Qq:

-               /* FALLTHROUGH */

        case MDOC_Do:
        case MDOC_Do:

-               /* FALLTHROUGH */

        case MDOC_Dq:
                print_text(h, "\\(rq");
                break;
        case MDOC_Po:
        case MDOC_Dq:
                print_text(h, "\\(rq");
                break;
        case MDOC_Po:

-               /* FALLTHROUGH */

        case MDOC_Pq:
                print_text(h, ")");
                break;
        case MDOC_Ql:
        case MDOC_Pq:
                print_text(h, ")");
                break;
        case MDOC_Ql:

-               /* FALLTHROUGH */

        case MDOC_So:
        case MDOC_So:

-               /* FALLTHROUGH */

        case MDOC_Sq:
                print_text(h, "\\(cq");
                break;
        default:
                abort();
        case MDOC_Sq:
                print_text(h, "\\(cq");
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 }
        }
 }

+
+static int
+mdoc_eo_pre(MDOC_ARGS)
+{
+
+       if (n->type != ROFFT_BODY)
+               return 1;
+
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               print_text(h, "\\&");
+       else if (n->end != ENDBODY_NOT ? n->child != NULL :
+           n->parent->head->child != NULL && (n->child != NULL ||
+           (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+               h->flags |= HTML_NOSPACE;
+       return 1;
+}
+
+static void
+mdoc_eo_post(MDOC_ARGS)
+{
+       int      body, tail;
+
+       if (n->type != ROFFT_BODY)
+               return;
+
+       if (n->end != ENDBODY_NOT) {
+               h->flags &= ~HTML_NOSPACE;
+               return;
+       }
+
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+       if (body && tail)
+               h->flags |= HTML_NOSPACE;
+       else if ( ! tail)
+               h->flags &= ~HTML_NOSPACE;
+}