Fix a few lies; polish wording and formatting while here.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 4f1ee482ad15b5dfde35af0ebe129014a68f273b..99eed7d4040cf752b7d7dc8d76630377384df8f6 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_html.c,v 1.126 2010/12/17 10:37:26 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.187 2014/03/30 19:47:48 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -34,9 +35,8 @@
 #include "main.h"
 
 #define        INDENT           5
 #include "main.h"
 
 #define        INDENT           5

-#define        HALFINDENT       3

 
 

-#define        MDOC_ARGS         const struct mdoc_meta *m, \
+#define        MDOC_ARGS         const struct mdoc_meta *meta, \

                          const struct mdoc_node *n, \
                          struct html *h
 
                          const struct mdoc_node *n, \
                          struct html *h
 


@@ -96,6 +96,7 @@ static        int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
 static int               mdoc_lk_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
 static int               mdoc_lk_pre(MDOC_ARGS);

+static int               mdoc_ll_pre(MDOC_ARGS);

 static int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);


@@ -190,7 +191,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Ec */ /* FIXME: no space */
        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Ec */ /* FIXME: no space */
        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */ 

-       {NULL, NULL}, /* Eo */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Eo */

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


@@ -243,6 +244,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_sp_pre, NULL}, /* sp */ 
        {mdoc__x_pre, mdoc__x_post}, /* %U */ 
        {NULL, NULL}, /* Ta */ 
        {mdoc_sp_pre, NULL}, /* sp */ 
        {mdoc__x_pre, mdoc__x_post}, /* %U */ 
        {NULL, NULL}, /* Ta */ 

+       {mdoc_ll_pre, NULL}, /* ll */

 };
 
 static const char * const lists[LIST_MAX] = {
 };
 
 static const char * const lists[LIST_MAX] = {


@@ -261,19 +263,12 @@ static    const char * const lists[LIST_MAX] = {
 };
 
 void
 };
 
 void

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

 {
 {

-       struct html     *h;
-       struct tag      *t;
-
-       h = (struct html *)arg;

 
 

-       print_gen_decls(h);
-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_mdoc(mdoc_meta(m), mdoc_node(m), h);
-       print_tagq(h, t);
-
-       printf("\n");
+       print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc),
+                       (struct html *)arg);
+       putchar('\n');

 }
 
 
 }
 
 


@@ -287,8 +282,8 @@ a2width(const char *p, struct roffsu *su)
 {
 
        if ( ! a2roffsu(p, su, SCALE_MAX)) {
 {
 
        if ( ! a2roffsu(p, su, SCALE_MAX)) {

-               su->unit = SCALE_EM;
-               su->scale = (int)strlen(p);
+               su->unit = SCALE_BU;
+               su->scale = html_strlen(p);

        }
 }
 
        }
 }
 


@@ -353,24 +348,31 @@ a2offs(const char *p, struct roffsu *su)
                SCALE_HS_INIT(su, INDENT);
        else if (0 == strcmp(p, "indent-two"))
                SCALE_HS_INIT(su, INDENT * 2);
                SCALE_HS_INIT(su, INDENT);
        else if (0 == strcmp(p, "indent-two"))
                SCALE_HS_INIT(su, INDENT * 2);

-       else if ( ! a2roffsu(p, su, SCALE_MAX)) {
-               su->unit = SCALE_EM;
-               su->scale = (int)strlen(p);
-       }
+       else if ( ! a2roffsu(p, su, SCALE_MAX))
+               SCALE_HS_INIT(su, html_strlen(p));

 }
 
 
 static void
 print_mdoc(MDOC_ARGS)
 {
 }
 
 
 static void
 print_mdoc(MDOC_ARGS)
 {

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

 
 

-       t = print_otag(h, TAG_HEAD, 0, NULL);
-       print_mdoc_head(m, n, h);
-       print_tagq(h, t);
+       PAIR_CLASS_INIT(&tag, "mandoc");

 
 

-       t = print_otag(h, TAG_BODY, 0, NULL);
-       print_mdoc_nodelist(m, n, h);
+       if ( ! (HTML_FRAGMENT & h->oflags)) {
+               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_mdoc_nodelist(meta, n, h);

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


@@ -382,13 +384,10 @@ print_mdoc_head(MDOC_ARGS)
 
        print_gen_head(h);
        bufinit(h);
 
        print_gen_head(h);
        bufinit(h);

-       buffmt(h, "%s(%s)", m->title, m->msec);
+       bufcat_fmt(h, "%s(%s)", meta->title, meta->msec);

 
 

-       if (m->arch) {
-               bufcat(h, " (");
-               bufcat(h, m->arch);
-               bufcat(h, ")");
-       }
+       if (meta->arch)
+               bufcat_fmt(h, " (%s)", meta->arch);

 
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);
 
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);


@@ -399,9 +398,9 @@ static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 
 print_mdoc_nodelist(MDOC_ARGS)
 {
 

-       print_mdoc_node(m, n, h);
+       print_mdoc_node(meta, n, h);

        if (n->next)
        if (n->next)

-               print_mdoc_nodelist(m, n->next, h);
+               print_mdoc_nodelist(meta, n->next, h);

 }
 
 
 }
 
 


@@ -414,45 +413,77 @@ print_mdoc_node(MDOC_ARGS)
        child = 1;
        t = h->tags.head;
 
        child = 1;
        t = h->tags.head;
 

-       bufinit(h);

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

-               child = mdoc_root_pre(m, n, h);
+               child = mdoc_root_pre(meta, n, h);

                break;
        case (MDOC_TEXT):
                break;
        case (MDOC_TEXT):

+               /* No tables in this mode... */
+               assert(NULL == h->tblt);
+
+               /*
+                * Make sure that if we're in a literal mode already
+                * (i.e., within a <PRE>) don't print the newline.
+                */
+               if (' ' == *n->string && MDOC_LINE & n->flags)
+                       if ( ! (HTML_LITERAL & h->flags))
+                               print_otag(h, TAG_BR, 0, NULL);
+               if (MDOC_DELIMC & n->flags)
+                       h->flags |= HTML_NOSPACE;

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

+               if (MDOC_DELIMO & n->flags)
+                       h->flags |= HTML_NOSPACE;
+               return;
+       case (MDOC_EQN):
+               print_eqn(h, n->eqn);
+               break;
+       case (MDOC_TBL):
+               /*
+                * This will take care of initialising all of the table
+                * state data for the first table, then tearing it down
+                * for the last one.
+                */
+               print_tbl(h, n->span);

                return;
        default:
                return;
        default:

+               /*
+                * Close out the current table, if it's open, and unset
+                * the "meta" table state.  This will be reopened on the
+                * next table element.
+                */
+               if (h->tblt) {
+                       print_tblclose(h);
+                       t = h->tags.head;
+               }
+
+               assert(NULL == h->tblt);

                if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
                if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)

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

                break;
        }
 
        if (HTML_KEEP & h->flags) {
                break;
        }
 
        if (HTML_KEEP & h->flags) {

-               if (n->prev && n->prev->line != n->line) {
+               if (n->prev ? (n->prev->lastline != n->line) :
+                   (n->parent && n->parent->line != n->line)) {

                        h->flags &= ~HTML_KEEP;
                        h->flags |= HTML_PREKEEP;
                        h->flags &= ~HTML_KEEP;
                        h->flags |= HTML_PREKEEP;

-               } else if (NULL == n->prev) {
-                       if (n->parent && n->parent->line != n->line) {
-                               h->flags &= ~HTML_KEEP;
-                               h->flags |= HTML_PREKEEP;
-                       }

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

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

 
        print_stagq(h, t);
 
 
        print_stagq(h, t);
 

-       bufinit(h);

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

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

                break;
        default:
                if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
                break;
        default:
                if (mdocs[n->tok].post && ENDBODY_NOT == n->end)

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

                break;
        }
 }
                break;
        }
 }


@@ -461,28 +492,30 @@ print_mdoc_node(MDOC_ARGS)
 static void
 mdoc_root_post(MDOC_ARGS)
 {
 static void
 mdoc_root_post(MDOC_ARGS)
 {

-       struct htmlpair  tag[2];
+       struct htmlpair  tag[3];

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

-       char             b[DATESIZ];

 
 

-       time2a(m->date, b, DATESIZ);
+       PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
+       PAIR_CLASS_INIT(&tag[1], "foot");
+       PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+       t = print_otag(h, TAG_TABLE, 3, tag);
+       PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);

 
 

-       PAIR_CLASS_INIT(&tag[0], "foot");
-       PAIR_SUMMARY_INIT(&tag[1], "Document Footer");
-       t = print_otag(h, TAG_TABLE, 2, tag);
+       print_otag(h, TAG_TBODY, 0, NULL);

 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        PAIR_CLASS_INIT(&tag[0], "foot-date");
        print_otag(h, TAG_TD, 1, tag);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        PAIR_CLASS_INIT(&tag[0], "foot-date");
        print_otag(h, TAG_TD, 1, tag);

-
-       print_text(h, b);
+       print_text(h, meta->date);

        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");

-       print_otag(h, TAG_TD, 1, tag);
-
-       print_text(h, m->os);
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+       print_otag(h, TAG_TD, 2, tag);
+       print_text(h, meta->os);

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


@@ -495,37 +528,43 @@ mdoc_root_pre(MDOC_ARGS)
        struct tag      *t, *tt;
        char             b[BUFSIZ], title[BUFSIZ];
 
        struct tag      *t, *tt;
        char             b[BUFSIZ], title[BUFSIZ];
 

-       strlcpy(b, m->vol, BUFSIZ);
+       strlcpy(b, meta->vol, BUFSIZ);

 
 

-       if (m->arch) {
+       if (meta->arch) {

                strlcat(b, " (", BUFSIZ);
                strlcat(b, " (", BUFSIZ);

-               strlcat(b, m->arch, BUFSIZ);
+               strlcat(b, meta->arch, BUFSIZ);

                strlcat(b, ")", BUFSIZ);
        }
 
                strlcat(b, ")", BUFSIZ);
        }
 

-       snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
+       snprintf(title, BUFSIZ - 1, "%s(%s)", meta->title, meta->msec);
+
+       PAIR_SUMMARY_INIT(&tag[0], "Document Header");
+       PAIR_CLASS_INIT(&tag[1], "head");
+       PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+       t = print_otag(h, TAG_TABLE, 3, tag);
+       PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);

 
 

-       PAIR_CLASS_INIT(&tag[0], "head");
-       PAIR_SUMMARY_INIT(&tag[1], "Document Header");
-       t = print_otag(h, TAG_TABLE, 2, tag);
+       print_otag(h, TAG_TBODY, 0, NULL);

 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        PAIR_CLASS_INIT(&tag[0], "head-ltitle");
        print_otag(h, TAG_TD, 1, tag);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        PAIR_CLASS_INIT(&tag[0], "head-ltitle");
        print_otag(h, TAG_TD, 1, tag);

-

        print_text(h, title);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-vol");
        print_text(h, title);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-vol");

-       print_otag(h, TAG_TD, 1, tag);
-
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
+       print_otag(h, TAG_TD, 2, tag);

        print_text(h, b);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");
        print_text(h, b);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");

-       print_otag(h, TAG_TD, 1, tag);
-
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+       print_otag(h, TAG_TD, 2, tag);

        print_text(h, title);
        print_tagq(h, t);
        return(1);
        print_text(h, title);
        print_tagq(h, t);
        return(1);


@@ -537,7 +576,6 @@ static int
 mdoc_sh_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 mdoc_sh_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;

-       char             buf[BUFSIZ];

 
        if (MDOC_BLOCK == n->type) {
                PAIR_CLASS_INIT(&tag, "section");
 
        if (MDOC_BLOCK == n->type) {
                PAIR_CLASS_INIT(&tag, "section");


@@ -546,25 +584,29 @@ mdoc_sh_pre(MDOC_ARGS)
        } else if (MDOC_BODY == n->type)
                return(1);
 
        } else if (MDOC_BODY == n->type)
                return(1);
 

-       buf[0] = '\0';
-       for (n = n->child; n; n = n->next) {
-               html_idcat(buf, n->string, BUFSIZ);
-               if (n->next)
-                       html_idcat(buf, " ", BUFSIZ);
+       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, " ");

        }
 
        }
 

-       PAIR_ID_INIT(&tag, buf);
-       print_otag(h, TAG_H1, 1, &tag);
+       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);
 }
 

-

 /* ARGSUSED */
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 /* ARGSUSED */
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;

-       char             buf[BUFSIZ];

 
        if (MDOC_BLOCK == n->type) {
                PAIR_CLASS_INIT(&tag, "subsection");
 
        if (MDOC_BLOCK == n->type) {
                PAIR_CLASS_INIT(&tag, "subsection");


@@ -573,15 +615,21 @@ mdoc_ss_pre(MDOC_ARGS)
        } else if (MDOC_BODY == n->type)
                return(1);
 
        } else if (MDOC_BODY == n->type)
                return(1);
 

-       buf[0] = '\0';
-       for (n = n->child; n; n = n->next) {
-               html_idcat(buf, n->string, BUFSIZ);
-               if (n->next)
-                       html_idcat(buf, " ", BUFSIZ);
+       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, " ");

        }
 
        }
 

-       PAIR_ID_INIT(&tag, buf);
-       print_otag(h, TAG_H2, 1, &tag);
+       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);
 }
 
        return(1);
 }
 


@@ -593,7 +641,7 @@ mdoc_fl_pre(MDOC_ARGS)
        struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "flag");
        struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "flag");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

 
        /* `Cm' has no leading hyphen. */
 
 
        /* `Cm' has no leading hyphen. */
 


@@ -634,20 +682,20 @@ mdoc_nm_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
        struct roffsu    su;
 {
        struct htmlpair  tag;
        struct roffsu    su;

-       size_t           len;
+       int              len;

 
        switch (n->type) {
        case (MDOC_ELEM):
                synopsis_pre(h, n);
                PAIR_CLASS_INIT(&tag, "name");
 
        switch (n->type) {
        case (MDOC_ELEM):
                synopsis_pre(h, n);
                PAIR_CLASS_INIT(&tag, "name");

-               print_otag(h, TAG_SPAN, 1, &tag);
-               if (NULL == n->child && m->name)
-                       print_text(h, m->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);
                return(1);
        case (MDOC_HEAD):
                print_otag(h, TAG_TD, 0, NULL);

-               if (NULL == n->child && m->name)
-                       print_text(h, m->name);
+               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 (MDOC_BODY):
                print_otag(h, TAG_TD, 0, NULL);


@@ -662,12 +710,13 @@ mdoc_nm_pre(MDOC_ARGS)
 
        for (len = 0, n = n->child; n; n = n->next)
                if (MDOC_TEXT == n->type)
 
        for (len = 0, n = n->child; n; n = n->next)
                if (MDOC_TEXT == n->type)

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

 
 

-       if (0 == len && m->name)
-               len = strlen(m->name);
+       if (0 == len && meta->name)
+               len = html_strlen(meta->name);

 
        SCALE_HS_INIT(&su, (double)len);
 
        SCALE_HS_INIT(&su, (double)len);

+       bufinit(h);

        bufcat_su(h, "width", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_COL, 1, &tag);
        bufcat_su(h, "width", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_COL, 1, &tag);


@@ -682,8 +731,7 @@ mdoc_nm_pre(MDOC_ARGS)
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {

-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
+       struct htmlpair  tag[2];

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


@@ -699,16 +747,16 @@ mdoc_xr_pre(MDOC_ARGS)
        } else
                print_otag(h, TAG_A, 1, tag);
 
        } else
                print_otag(h, TAG_A, 1, tag);
 

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

 
 

-       if (NULL == (nn = nn->next))
+       if (NULL == (n = n->next))

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

-       print_text(h, nn->string);
+       print_text(h, n->string);

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


@@ -720,7 +768,8 @@ static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
 mdoc_ns_pre(MDOC_ARGS)
 {
 

-       h->flags |= HTML_NOSPACE;
+       if ( ! (MDOC_LINE & n->flags))
+               h->flags |= HTML_NOSPACE;

        return(1);
 }
 
        return(1);
 }
 


@@ -732,7 +781,7 @@ mdoc_ar_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "arg");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "arg");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -743,6 +792,7 @@ mdoc_xx_pre(MDOC_ARGS)
 {
        const char      *pp;
        struct htmlpair  tag;
 {
        const char      *pp;
        struct htmlpair  tag;

+       int              flags;

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


@@ -769,8 +819,15 @@ mdoc_xx_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);

+

        print_text(h, pp);
        print_text(h, pp);

-       return(1);
+       if (n->child) {
+               flags = h->flags;
+               h->flags |= HTML_KEEP;
+               print_text(h, n->child->string);
+               h->flags = flags;
+       }
+       return(0);

 }
 
 
 }
 
 


@@ -778,22 +835,31 @@ mdoc_xx_pre(MDOC_ARGS)
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {

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

 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 

-       for (nn = n->child; nn; nn = nn->next)
-               print_mdoc_node(m, nn, h);
+       if (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 (n->child)
+       if (NULL != (n = n->next)) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "-");

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

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

 
 

-       print_text(h, "BSD");

        return(0);
 }
 
        return(0);
 }
 

+/* ARGSUSED */

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


@@ -808,11 +874,13 @@ mdoc_it_pre(MDOC_ARGS)
 
        assert(bl);
 
 
        assert(bl);
 

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

 
        assert(lists[type]);
        PAIR_CLASS_INIT(&tag[0], lists[type]);
 
 
        assert(lists[type]);
        PAIR_CLASS_INIT(&tag[0], lists[type]);
 

+       bufinit(h);
+

        if (MDOC_HEAD == n->type) {
                switch (type) {
                case(LIST_bullet):
        if (MDOC_HEAD == n->type) {
                switch (type) {
                case(LIST_bullet):


@@ -834,10 +902,14 @@ mdoc_it_pre(MDOC_ARGS)
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):

-                       SCALE_VS_INIT(&su, ! bl->data.Bl->comp);
+                       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);
                        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):
                        break;
                        break;
                case(LIST_column):
                        break;


@@ -855,7 +927,7 @@ mdoc_it_pre(MDOC_ARGS)
                case(LIST_enum):
                        /* FALLTHROUGH */
                case(LIST_item):
                case(LIST_enum):
                        /* FALLTHROUGH */
                case(LIST_item):

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


@@ -869,17 +941,17 @@ mdoc_it_pre(MDOC_ARGS)
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):

-                       if (NULL == bl->data.Bl->width) {
+                       if (NULL == bl->norm->Bl.width) {

                                print_otag(h, TAG_DD, 1, tag);
                                break;
                        }
                                print_otag(h, TAG_DD, 1, tag);
                                break;
                        }

-                       a2width(bl->data.Bl->width, &su);
+                       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);
                        break;
                case(LIST_column):
                        bufcat_su(h, "margin-left", &su);
                        PAIR_STYLE_INIT(&tag[1], h);
                        print_otag(h, TAG_DD, 2, tag);
                        break;
                case(LIST_column):

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


@@ -904,18 +976,19 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {

-       size_t           i;
+       int              i;

        struct htmlpair  tag[3];
        struct roffsu    su;
        struct htmlpair  tag[3];
        struct roffsu    su;

+       char             buf[BUFSIZ];

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

-               if (LIST_column == n->data.Bl->type)
+               if (LIST_column == n->norm->Bl.type)

                        print_otag(h, TAG_TBODY, 0, NULL);
                return(1);
        }
 
        if (MDOC_HEAD == n->type) {
                        print_otag(h, TAG_TBODY, 0, NULL);
                return(1);
        }
 
        if (MDOC_HEAD == n->type) {

-               if (LIST_column != n->data.Bl->type)
+               if (LIST_column != n->norm->Bl.type)

                        return(0);
 
                /*
                        return(0);
 
                /*


@@ -925,10 +998,10 @@ 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 < n->data.Bl->ncols; i++) {
-                       a2width(n->data.Bl->cols[i], &su);
+               for (i = 0; i < (int)n->norm->Bl.ncols; i++) {

                        bufinit(h);
                        bufinit(h);

-                       if (i < n->data.Bl->ncols - 1)
+                       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);
                                bufcat_su(h, "width", &su);
                        else
                                bufcat_su(h, "min-width", &su);


@@ -940,24 +1013,24 @@ mdoc_bl_pre(MDOC_ARGS)
        }
 
        SCALE_VS_INIT(&su, 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);
 
        bufcat_su(h, "margin-top", &su);
        bufcat_su(h, "margin-bottom", &su);
        PAIR_STYLE_INIT(&tag[0], h);
 

-       assert(lists[n->data.Bl->type]);
-       PAIR_CLASS_INIT(&tag[1], lists[n->data.Bl->type]);
-       i = 2;
+       assert(lists[n->norm->Bl.type]);
+       strlcpy(buf, "list ", BUFSIZ);
+       strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
+       PAIR_INIT(&tag[1], ATTR_CLASS, buf);

 
        /* Set the block's left-hand margin. */
 
 
        /* Set the block's left-hand margin. */
 

-       if (n->data.Bl->offs) {
-               a2offs(n->data.Bl->offs, &su);
+       if (n->norm->Bl.offs) {
+               a2offs(n->norm->Bl.offs, &su);

                bufcat_su(h, "margin-left", &su);
                bufcat_su(h, "margin-left", &su);

-               PAIR_STYLE_INIT(&tag[2], h);
-               i = 3;

        }
 
        }
 

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

        case(LIST_bullet):
                /* FALLTHROUGH */
        case(LIST_dash):
        case(LIST_bullet):
                /* FALLTHROUGH */
        case(LIST_dash):


@@ -965,10 +1038,10 @@ mdoc_bl_pre(MDOC_ARGS)
        case(LIST_hyphen):
                /* FALLTHROUGH */
        case(LIST_item):
        case(LIST_hyphen):
                /* FALLTHROUGH */
        case(LIST_item):

-               print_otag(h, TAG_UL, i, tag);
+               print_otag(h, TAG_UL, 2, tag);

                break;
        case(LIST_enum):
                break;
        case(LIST_enum):

-               print_otag(h, TAG_OL, i, tag);
+               print_otag(h, TAG_OL, 2, tag);

                break;
        case(LIST_diag):
                /* FALLTHROUGH */
                break;
        case(LIST_diag):
                /* FALLTHROUGH */


@@ -979,10 +1052,10 @@ mdoc_bl_pre(MDOC_ARGS)
        case(LIST_ohang):
                /* FALLTHROUGH */
        case(LIST_tag):
        case(LIST_ohang):
                /* FALLTHROUGH */
        case(LIST_tag):

-               print_otag(h, TAG_DL, i, tag);
+               print_otag(h, TAG_DL, 2, tag);

                break;
        case(LIST_column):
                break;
        case(LIST_column):

-               print_otag(h, TAG_TABLE, i, tag);
+               print_otag(h, TAG_TABLE, 2, tag);

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


@@ -996,29 +1069,35 @@ mdoc_bl_pre(MDOC_ARGS)
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {

-       const struct mdoc_node  *nn;
-       struct tag              *t;
-       struct htmlpair          tag;
+       struct tag      *t;
+       struct htmlpair  tag;
+       int              nchild;
+
+       if (n->prev)
+               print_otag(h, TAG_BR, 0, NULL);

 
        PAIR_CLASS_INIT(&tag, "utility");
 
        print_text(h, "The");
 
        PAIR_CLASS_INIT(&tag, "utility");
 
        print_text(h, "The");

-       for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);

 
 

-               h->flags |= HTML_NOSPACE;
+       nchild = n->nchild;
+       for (n = n->child; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);

 
 

-               if (nn->next && NULL == nn->next->next)
-                       print_text(h, ", and");
-               else if (nn->next)
+               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, ",");
                        print_text(h, ",");

-               else
-                       h->flags &= ~HTML_NOSPACE;
+               }
+
+               if (n->next && NULL == n->next->next)
+                       print_text(h, "and");

        }
 
        }
 

-       if (n->child && n->child->next)
+       if (nchild > 1)

                print_text(h, "utilities exit");
        else
                print_text(h, "utility exits");
                print_text(h, "utilities exit");
        else
                print_text(h, "utility exits");


@@ -1051,6 +1130,7 @@ mdoc_d1_pre(MDOC_ARGS)
                return(1);
 
        SCALE_VS_INIT(&su, 0);
                return(1);
 
        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);
        bufcat_su(h, "margin-top", &su);
        bufcat_su(h, "margin-bottom", &su);
        PAIR_STYLE_INIT(&tag[0], h);


@@ -1058,12 +1138,13 @@ mdoc_d1_pre(MDOC_ARGS)
 
        /* BLOCKQUOTE needs a block body. */
 
 
        /* BLOCKQUOTE needs a block body. */
 

+       PAIR_CLASS_INIT(&tag[0], "display");
+       print_otag(h, TAG_DIV, 1, tag);
+

        if (MDOC_Dl == n->tok) {
        if (MDOC_Dl == n->tok) {

-               PAIR_CLASS_INIT(&tag[0], "lit display");
-               print_otag(h, TAG_DIV, 1, tag);
-       } else
-               PAIR_CLASS_INIT(&tag[0], "display");
-               print_otag(h, TAG_DIV, 1, tag);
+               PAIR_CLASS_INIT(&tag[0], "lit");
+               print_otag(h, TAG_CODE, 1, tag);
+       } 

 
        return(1);
 }
 
        return(1);
 }


@@ -1073,20 +1154,21 @@ mdoc_d1_pre(MDOC_ARGS)
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {
 static int
 mdoc_sx_pre(MDOC_ARGS)
 {

-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-       char                     buf[BUFSIZ];
+       struct htmlpair  tag[2];

 
 

-       strlcpy(buf, "#", BUFSIZ);
-       for (nn = n->child; nn; nn = nn->next) {
-               html_idcat(buf, nn->string, BUFSIZ);
-               if (nn->next)
-                       html_idcat(buf, " ", BUFSIZ);
+       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_CLASS_INIT(&tag[0], "link-sec");

-       PAIR_HREF_INIT(&tag[1], buf);
+       PAIR_HREF_INIT(&tag[1], h->buf);

 
 

+       print_otag(h, TAG_I, 1, tag);

        print_otag(h, TAG_A, 2, tag);
        return(1);
 }
        print_otag(h, TAG_A, 2, tag);
        return(1);
 }


@@ -1097,7 +1179,7 @@ static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];

-       int                      comp;
+       int                      comp, sv;

        const struct mdoc_node  *nn;
        struct roffsu            su;
 
        const struct mdoc_node  *nn;
        struct roffsu            su;
 


@@ -1105,7 +1187,7 @@ mdoc_bd_pre(MDOC_ARGS)
                return(0);
 
        if (MDOC_BLOCK == n->type) {
                return(0);
 
        if (MDOC_BLOCK == n->type) {

-               comp = n->data.Bd->comp;
+               comp = n->norm->Bd.comp;

                for (nn = n; nn && ! comp; nn = nn->parent) {
                        if (MDOC_BLOCK != nn->type)
                                continue;
                for (nn = n; nn && ! comp; nn = nn->parent) {
                        if (MDOC_BLOCK != nn->type)
                                continue;


@@ -1120,14 +1202,15 @@ mdoc_bd_pre(MDOC_ARGS)
        }
 
        SCALE_HS_INIT(&su, 0);
        }
 
        SCALE_HS_INIT(&su, 0);

-       if (n->data.Bd->offs)
-               a2offs(n->data.Bd->offs, &su);
-
+       if (n->norm->Bd.offs)
+               a2offs(n->norm->Bd.offs, &su);
+       
+       bufinit(h);

        bufcat_su(h, "margin-left", &su);
        PAIR_STYLE_INIT(&tag[0], h);
 
        bufcat_su(h, "margin-left", &su);
        PAIR_STYLE_INIT(&tag[0], h);
 

-       if (DISP_unfilled != n->data.Bd->type && 
-                       DISP_literal != n->data.Bd->type) {
+       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);
                PAIR_CLASS_INIT(&tag[1], "display");
                print_otag(h, TAG_DIV, 2, tag);
                return(1);


@@ -1136,8 +1219,13 @@ mdoc_bd_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[1], "lit display");
        print_otag(h, TAG_PRE, 2, tag);
 
        PAIR_CLASS_INIT(&tag[1], "lit display");
        print_otag(h, TAG_PRE, 2, tag);
 

+       /* This can be recursive: save & set our literal state. */
+
+       sv = h->flags & HTML_LITERAL;
+       h->flags |= HTML_LITERAL;
+

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

-               print_mdoc_node(m, nn, h);
+               print_mdoc_node(meta, nn, h);

                /*
                 * If the printed node flushes its own line, then we
                 * needn't do it here as well.  This is hacky, but the
                /*
                 * If the printed node flushes its own line, then we
                 * needn't do it here as well.  This is hacky, but the


@@ -1172,6 +1260,9 @@ mdoc_bd_pre(MDOC_ARGS)
                h->flags |= HTML_NOSPACE;
        }
 
                h->flags |= HTML_NOSPACE;
        }
 

+       if (0 == sv)
+               h->flags &= ~HTML_LITERAL;
+

        return(0);
 }
 
        return(0);
 }
 


@@ -1183,7 +1274,7 @@ mdoc_pa_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "file");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "file");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1195,7 +1286,7 @@ mdoc_ad_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "addr");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "addr");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1222,7 +1313,7 @@ mdoc_cd_pre(MDOC_ARGS)
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "config");
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "config");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1273,20 +1364,24 @@ mdoc_fa_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "farg");
        if (n->parent->tok != MDOC_Fo) {
 
        PAIR_CLASS_INIT(&tag, "farg");
        if (n->parent->tok != MDOC_Fo) {

-               print_otag(h, TAG_SPAN, 1, &tag);
+               print_otag(h, TAG_I, 1, &tag);

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

-               t = print_otag(h, TAG_SPAN, 1, &tag);
+               t = print_otag(h, TAG_I, 1, &tag);

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

-               if (nn->next)
+               if (nn->next) {
+                       h->flags |= HTML_NOSPACE;

                        print_text(h, ",");
                        print_text(h, ",");

+               }

        }
 
        }
 

-       if (n->child && n->next && n->next->tok == MDOC_Fa)
+       if (n->child && n->next && n->next->tok == MDOC_Fa) {
+               h->flags |= HTML_NOSPACE;

                print_text(h, ",");
                print_text(h, ",");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1296,13 +1391,60 @@ mdoc_fa_pre(MDOC_ARGS)
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {

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

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

-       PAIR_CLASS_INIT(&tag, "macro");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if (NULL == (n = n->child))
+               return(0);
+
+       assert(MDOC_TEXT == n->type);
+
+       if (strcmp(n->string, "#include")) {
+               PAIR_CLASS_INIT(&tag[0], "macro");
+               print_otag(h, TAG_B, 1, tag);
+               return(1);
+       }
+
+       PAIR_CLASS_INIT(&tag[0], "includes");
+       print_otag(h, TAG_B, 1, tag);
+       print_text(h, n->string);
+
+       if (NULL != (n = n->next)) {
+               assert(MDOC_TEXT == n->type);
+               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) {
+                       buffmt_includes(h, buf);
+                       PAIR_HREF_INIT(&tag[i], h->buf);
+                       i++;
+               } 
+
+               t = print_otag(h, TAG_A, i, tag);
+               print_text(h, n->string);
+               print_tagq(h, t);
+
+               n = n->next;
+       }
+
+       for ( ; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);
+               print_text(h, n->string);
+       }
+
+       return(0);

 }
 
 
 }
 
 


@@ -1334,7 +1476,7 @@ mdoc_ft_pre(MDOC_ARGS)
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "ftype");
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "ftype");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1343,13 +1485,13 @@ mdoc_ft_pre(MDOC_ARGS)
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {

-       struct tag              *t;
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-       char                     nbuf[BUFSIZ];
-       const char              *sp, *ep;
-       int                      sz, i;
+       struct tag      *t;
+       struct htmlpair  tag[2];
+       char             nbuf[BUFSIZ];
+       const char      *sp, *ep;
+       int              sz, i, pretty;

 
 

+       pretty = MDOC_SYNPRETTY & n->flags;

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


@@ -1359,7 +1501,7 @@ mdoc_fn_pre(MDOC_ARGS)
        ep = strchr(sp, ' ');
        if (NULL != ep) {
                PAIR_CLASS_INIT(&tag[0], "ftype");
        ep = strchr(sp, ' ');
        if (NULL != ep) {
                PAIR_CLASS_INIT(&tag[0], "ftype");

-               t = print_otag(h, TAG_SPAN, 1, tag);
+               t = print_otag(h, TAG_I, 1, tag);

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


@@ -1390,7 +1532,7 @@ mdoc_fn_pre(MDOC_ARGS)
        }
 #endif
 
        }
 #endif
 

-       t = print_otag(h, TAG_SPAN, 1, tag);
+       t = print_otag(h, TAG_B, 1, tag);

 
        if (sp) {
                strlcpy(nbuf, sp, BUFSIZ);
 
        if (sp) {
                strlcpy(nbuf, sp, BUFSIZ);


@@ -1401,26 +1543,33 @@ mdoc_fn_pre(MDOC_ARGS)
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");

+       h->flags |= HTML_NOSPACE;

 
 

-       bufinit(h);

        PAIR_CLASS_INIT(&tag[0], "farg");
        PAIR_CLASS_INIT(&tag[0], "farg");

+       bufinit(h);

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

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

                i = 1;
                if (MDOC_SYNPRETTY & n->flags)
                        i = 2;
                i = 1;
                if (MDOC_SYNPRETTY & n->flags)
                        i = 2;

-               t = print_otag(h, TAG_SPAN, i, tag);
-               print_text(h, nn->string);
+               t = print_otag(h, TAG_I, i, tag);
+               print_text(h, n->string);

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

-               if (nn->next)
+               if (n->next) {
+                       h->flags |= HTML_NOSPACE;

                        print_text(h, ",");
                        print_text(h, ",");

+               }

        }
 
        }
 

+       h->flags |= HTML_NOSPACE;

        print_text(h, ")");
        print_text(h, ")");

-       if (MDOC_SYNPRETTY & n->flags)
+
+       if (pretty) {
+               h->flags |= HTML_NOSPACE;

                print_text(h, ";");
                print_text(h, ";");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1451,6 +1600,14 @@ mdoc_sm_pre(MDOC_ARGS)
        return(0);
 }
 
        return(0);
 }
 

+/* ARGSUSED */
+static int
+mdoc_ll_pre(MDOC_ARGS)
+{
+
+       return(0);
+}
+

 /* ARGSUSED */
 static int
 mdoc_pp_pre(MDOC_ARGS)
 /* ARGSUSED */
 static int
 mdoc_pp_pre(MDOC_ARGS)


@@ -1458,7 +1615,6 @@ mdoc_pp_pre(MDOC_ARGS)
 
        print_otag(h, TAG_P, 0, NULL);
        return(0);
 
        print_otag(h, TAG_P, 0, NULL);
        return(0);

-

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -1471,11 +1627,13 @@ mdoc_sp_pre(MDOC_ARGS)
        SCALE_VS_INIT(&su, 1);
 
        if (MDOC_sp == n->tok) {
        SCALE_VS_INIT(&su, 1);
 
        if (MDOC_sp == n->tok) {

-               if (n->child)
-                       a2roffsu(n->child->string, &su, SCALE_VS);
+               if (NULL != (n = n->child))
+                       if ( ! a2roffsu(n->string, &su, SCALE_VS))
+                               SCALE_VS_INIT(&su, atoi(n->string));

        } else
                su.scale = 0;
 
        } else
                su.scale = 0;
 

+       bufinit(h);

        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);


@@ -1491,20 +1649,23 @@ mdoc_sp_pre(MDOC_ARGS)
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {

-       const struct mdoc_node  *nn;
-       struct htmlpair          tag[2];
+       struct htmlpair  tag[2];
+
+       if (NULL == (n = n->child))
+               return(0);

 
 

-       nn = n->child;
+       assert(MDOC_TEXT == n->type);

 
        PAIR_CLASS_INIT(&tag[0], "link-ext");
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");

-       PAIR_HREF_INIT(&tag[1], nn->string);
+       PAIR_HREF_INIT(&tag[1], n->string);
+

        print_otag(h, TAG_A, 2, tag);
 
        print_otag(h, TAG_A, 2, tag);
 

-       if (NULL == nn || NULL == nn->next) 
-               return(1);
+       if (NULL == n->next)
+               print_text(h, n->string);

 
 

-       for (nn = nn->next; nn; nn = nn->next) 
-               print_text(h, nn->string);
+       for (n = n->next; n; n = n->next)
+               print_text(h, n->string);

 
        return(0);
 }
 
        return(0);
 }


@@ -1514,19 +1675,21 @@ mdoc_lk_pre(MDOC_ARGS)
 static int
 mdoc_mt_pre(MDOC_ARGS)
 {
 static int
 mdoc_mt_pre(MDOC_ARGS)
 {

-       struct htmlpair          tag[2];
-       struct tag              *t;
-       const struct mdoc_node  *nn;
+       struct htmlpair  tag[2];
+       struct tag      *t;

 
        PAIR_CLASS_INIT(&tag[0], "link-mail");
 
 
        PAIR_CLASS_INIT(&tag[0], "link-mail");
 

-       for (nn = n->child; nn; nn = nn->next) {
+       for (n = n->child; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);
+

                bufinit(h);
                bufcat(h, "mailto:");
                bufinit(h);
                bufcat(h, "mailto:");

-               bufcat(h, nn->string);
+               bufcat(h, n->string);
+

                PAIR_HREF_INIT(&tag[1], h->buf);
                t = print_otag(h, TAG_A, 2, tag);
                PAIR_HREF_INIT(&tag[1], h->buf);
                t = print_otag(h, TAG_A, 2, tag);

-               print_text(h, nn->string);
+               print_text(h, n->string);

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


@@ -1557,7 +1720,7 @@ mdoc_fo_pre(MDOC_ARGS)
        assert(n->child->string);
 
        PAIR_CLASS_INIT(&tag, "fname");
        assert(n->child->string);
 
        PAIR_CLASS_INIT(&tag, "fname");

-       t = print_otag(h, TAG_SPAN, 1, &tag);
+       t = print_otag(h, TAG_B, 1, &tag);

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


@@ -1571,7 +1734,9 @@ mdoc_fo_post(MDOC_ARGS)
 
        if (MDOC_BODY != n->type)
                return;
 
        if (MDOC_BODY != n->type)
                return;

+       h->flags |= HTML_NOSPACE;

        print_text(h, ")");
        print_text(h, ")");

+       h->flags |= HTML_NOSPACE;

        print_text(h, ";");
 }
 
        print_text(h, ";");
 }
 


@@ -1580,15 +1745,21 @@ mdoc_fo_post(MDOC_ARGS)
 static int
 mdoc_in_pre(MDOC_ARGS)
 {
 static int
 mdoc_in_pre(MDOC_ARGS)
 {

-       const struct mdoc_node  *nn;
-       struct tag              *t;
-       struct htmlpair          tag[2];
-       int                      i;
+       struct tag      *t;
+       struct htmlpair  tag[2];
+       int              i;

 
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag[0], "includes");
 
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag[0], "includes");

-       print_otag(h, TAG_SPAN, 1, tag);
+       print_otag(h, TAG_B, 1, tag);
+
+       /*
+        * The first argument of the `In' gets special treatment as
+        * being a linked value.  Subsequent values are printed
+        * afterward.  groff does similarly.  This also handles the case
+        * of no children.
+        */

 
        if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
                print_text(h, "#include");
 
        if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
                print_text(h, "#include");


@@ -1596,23 +1767,33 @@ mdoc_in_pre(MDOC_ARGS)
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 

-       for (nn = n->child; nn; nn = nn->next) {
+       if (NULL != (n = n->child)) {
+               assert(MDOC_TEXT == n->type);
+

                PAIR_CLASS_INIT(&tag[0], "link-includes");
                PAIR_CLASS_INIT(&tag[0], "link-includes");

+

                i = 1;
                i = 1;

-               bufinit(h);

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

-                       buffmt_includes(h, nn->string);
+                       buffmt_includes(h, n->string);

                        PAIR_HREF_INIT(&tag[i], h->buf);
                        i++;
                        PAIR_HREF_INIT(&tag[i], h->buf);
                        i++;

-               }
+               } 
+

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

-               print_mdoc_node(m, nn, h);
+               print_text(h, n->string);

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

+
+               n = n->next;

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

+       for ( ; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);
+               print_text(h, n->string);
+       }
+

        return(0);
 }
 
        return(0);
 }
 


@@ -1624,7 +1805,7 @@ mdoc_ic_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "cmd");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "cmd");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1633,29 +1814,38 @@ mdoc_ic_pre(MDOC_ARGS)
 static int
 mdoc_rv_pre(MDOC_ARGS)
 {
 static int
 mdoc_rv_pre(MDOC_ARGS)
 {

-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
-       struct tag              *t;
+       struct htmlpair  tag;
+       struct tag      *t;
+       int              nchild;
+
+       if (n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
+
+       PAIR_CLASS_INIT(&tag, "fname");

 
 

-       print_otag(h, TAG_DIV, 0, NULL);

        print_text(h, "The");
 
        print_text(h, "The");
 

-       for (nn = n->child; nn; nn = nn->next) {
-               PAIR_CLASS_INIT(&tag, "fname");
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
+       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);
 
                h->flags |= HTML_NOSPACE;
                print_tagq(h, t);
 
                h->flags |= HTML_NOSPACE;

-               if (nn->next && NULL == nn->next->next)
-                       print_text(h, "(), and");
-               else if (nn->next)
-                       print_text(h, "(),");
-               else
-                       print_text(h, "()");
+               print_text(h, "()");
+
+               if (nchild > 2 && n->next) {
+                       h->flags |= HTML_NOSPACE;
+                       print_text(h, ",");
+               }
+
+               if (n->next && NULL == n->next->next)
+                       print_text(h, "and");

        }
 
        }
 

-       if (n->child && n->child->next)
+       if (nchild > 1)

                print_text(h, "functions return");
        else
                print_text(h, "function returns");
                print_text(h, "functions return");
        else
                print_text(h, "function returns");


@@ -1664,7 +1854,7 @@ mdoc_rv_pre(MDOC_ARGS)
                        "-1 is returned and the global variable");
 
        PAIR_CLASS_INIT(&tag, "var");
                        "-1 is returned and the global variable");
 
        PAIR_CLASS_INIT(&tag, "var");

-       t = print_otag(h, TAG_SPAN, 1, &tag);
+       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.");
        print_text(h, "errno");
        print_tagq(h, t);
                print_text(h, "is set to indicate the error.");


@@ -1679,7 +1869,7 @@ mdoc_va_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "var");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "var");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1708,13 +1898,11 @@ mdoc_bf_pre(MDOC_ARGS)
        else if (MDOC_BODY != n->type)
                return(1);
 
        else if (MDOC_BODY != n->type)
                return(1);
 

-       assert(n->data.Bf);
-
-       if (FONT_Em == n->data.Bf->font) 
+       if (FONT_Em == n->norm->Bf.font) 

                PAIR_CLASS_INIT(&tag[0], "emph");
                PAIR_CLASS_INIT(&tag[0], "emph");

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

                PAIR_CLASS_INIT(&tag[0], "symb");
                PAIR_CLASS_INIT(&tag[0], "symb");

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

                PAIR_CLASS_INIT(&tag[0], "lit");
        else
                PAIR_CLASS_INIT(&tag[0], "none");
                PAIR_CLASS_INIT(&tag[0], "lit");
        else
                PAIR_CLASS_INIT(&tag[0], "none");


@@ -1723,6 +1911,7 @@ mdoc_bf_pre(MDOC_ARGS)
         * 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_style(h, "display", "inline");
        SCALE_HS_INIT(&su, 1);
        /* Needs a left-margin for spacing. */


@@ -1790,7 +1979,7 @@ mdoc_li_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "lit");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "lit");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_CODE, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1833,8 +2022,9 @@ mdoc_lb_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
-               print_otag(h, TAG_DIV, 0, NULL);
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
+

        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);


@@ -1846,6 +2036,9 @@ static int
 mdoc__x_pre(MDOC_ARGS)
 {
        struct htmlpair tag[2];
 mdoc__x_pre(MDOC_ARGS)
 {
        struct htmlpair tag[2];

+       enum htmltag    t;
+
+       t = TAG_SPAN;

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


@@ -1856,6 +2049,7 @@ mdoc__x_pre(MDOC_ARGS)
                break;
        case(MDOC__B):
                PAIR_CLASS_INIT(&tag[0], "ref-book");
                break;
        case(MDOC__B):
                PAIR_CLASS_INIT(&tag[0], "ref-book");

+               t = TAG_I;

                break;
        case(MDOC__C):
                PAIR_CLASS_INIT(&tag[0], "ref-city");
                break;
        case(MDOC__C):
                PAIR_CLASS_INIT(&tag[0], "ref-city");


@@ -1865,9 +2059,11 @@ mdoc__x_pre(MDOC_ARGS)
                break;
        case(MDOC__I):
                PAIR_CLASS_INIT(&tag[0], "ref-issue");
                break;
        case(MDOC__I):
                PAIR_CLASS_INIT(&tag[0], "ref-issue");

+               t = TAG_I;

                break;
        case(MDOC__J):
                PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
                break;
        case(MDOC__J):
                PAIR_CLASS_INIT(&tag[0], "ref-jrnl");

+               t = TAG_I;

                break;
        case(MDOC__N):
                PAIR_CLASS_INIT(&tag[0], "ref-num");
                break;
        case(MDOC__N):
                PAIR_CLASS_INIT(&tag[0], "ref-num");


@@ -1899,7 +2095,7 @@ mdoc__x_pre(MDOC_ARGS)
        }
 
        if (MDOC__U != n->tok) {
        }
 
        if (MDOC__U != n->tok) {

-               print_otag(h, TAG_SPAN, 1, tag);
+               print_otag(h, t, 1, tag);

                return(1);
        }
 
                return(1);
        }
 


@@ -1925,6 +2121,7 @@ mdoc__x_post(MDOC_ARGS)
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 

+       h->flags |= HTML_NOSPACE;

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


@@ -1940,7 +2137,8 @@ mdoc_bk_pre(MDOC_ARGS)
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):

-               h->flags |= HTML_PREKEEP;
+               if (n->parent->args || 0 == n->prev->nchild)
+                       h->flags |= HTML_PREKEEP;

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


@@ -1994,6 +2192,8 @@ mdoc_quote_pre(MDOC_ARGS)
                PAIR_CLASS_INIT(&tag, "opt");
                print_otag(h, TAG_SPAN, 1, &tag);
                break;
                PAIR_CLASS_INIT(&tag, "opt");
                print_otag(h, TAG_SPAN, 1, &tag);
                break;

+       case (MDOC_Eo):
+               break;

        case (MDOC_Do):
                /* FALLTHROUGH */
        case (MDOC_Dq):
        case (MDOC_Do):
                /* FALLTHROUGH */
        case (MDOC_Dq):


@@ -2009,7 +2209,11 @@ mdoc_quote_pre(MDOC_ARGS)
                print_text(h, "(");
                break;
        case (MDOC_Ql):
                print_text(h, "(");
                break;
        case (MDOC_Ql):

-               /* FALLTHROUGH */
+               print_text(h, "\\(oq");
+               h->flags |= HTML_NOSPACE;
+               PAIR_CLASS_INIT(&tag, "lit");
+               print_otag(h, TAG_CODE, 1, &tag);
+               break;

        case (MDOC_So):
                /* FALLTHROUGH */
        case (MDOC_Sq):
        case (MDOC_So):
                /* FALLTHROUGH */
        case (MDOC_Sq):


@@ -2055,6 +2259,8 @@ mdoc_quote_post(MDOC_ARGS)
        case (MDOC_Bq):
                print_text(h, "\\(rB");
                break;
        case (MDOC_Bq):
                print_text(h, "\\(rB");
                break;

+       case (MDOC_Eo):
+               break;

        case (MDOC_Qo):
                /* FALLTHROUGH */
        case (MDOC_Qq):
        case (MDOC_Qo):
                /* FALLTHROUGH */
        case (MDOC_Qq):


@@ -2074,7 +2280,7 @@ mdoc_quote_post(MDOC_ARGS)
        case (MDOC_So):
                /* FALLTHROUGH */
        case (MDOC_Sq):
        case (MDOC_So):
                /* FALLTHROUGH */
        case (MDOC_Sq):

-               print_text(h, "\\(aq");
+               print_text(h, "\\(cq");

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