If we have to reparse the text line because we spring an input line trap,

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index fcde3658312191e889eb5ace0236873e0053ed4b..85be95b668b32f7e6ecbb91d2a83676419fe62ab 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,23 +1,21 @@
-/*     $Id: mdoc_html.c,v 1.193 2014/07/30 00:19:16 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.232 2015/04/18 17:53:21 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2015 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
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 


@@ -28,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


@@ -50,15 +48,13 @@ struct      htmlmdoc {
        void            (*post)(MDOC_ARGS);
 };
 
        void            (*post)(MDOC_ARGS);
 };
 

-static void              print_mdoc(MDOC_ARGS);

 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 *);
+                               const struct roff_node *);

 
 static void              a2width(const char *, struct roffsu *);
 
 static void              a2width(const char *, struct roffsu *);

-static void              a2offs(const char *, struct roffsu *);

 
 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);


@@ -85,6 +81,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);


@@ -101,6 +99,7 @@ static       int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_nm_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_nm_pre(MDOC_ARGS);

+static int               mdoc_no_pre(MDOC_ARGS);

 static int               mdoc_ns_pre(MDOC_ARGS);
 static int               mdoc_pa_pre(MDOC_ARGS);
 static void              mdoc_pf_post(MDOC_ARGS);
 static int               mdoc_ns_pre(MDOC_ARGS);
 static int               mdoc_pa_pre(MDOC_ARGS);
 static void              mdoc_pf_post(MDOC_ARGS);


@@ -185,17 +184,17 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_quote_pre, mdoc_quote_post}, /* Bq */
        {mdoc_xx_pre, NULL}, /* Bsx */
        {mdoc_bx_pre, NULL}, /* Bx */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bq */
        {mdoc_xx_pre, NULL}, /* Bsx */
        {mdoc_bx_pre, NULL}, /* Bx */

-       {NULL, NULL}, /* Db */
+       {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_xx_pre, NULL}, /* Fx */
        {mdoc_ms_pre, NULL}, /* Ms */

-       {mdoc_igndelim_pre, NULL}, /* No */
+       {mdoc_no_pre, NULL}, /* No */

        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
        {mdoc_xx_pre, NULL}, /* Ox */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
        {mdoc_xx_pre, NULL}, /* Ox */


@@ -264,15 +263,6 @@ static     const char * const lists[LIST_MAX] = {
 };
 
 
 };
 
 

-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
 /*
  * 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


@@ -282,17 +272,18 @@ static void
 a2width(const char *p, struct roffsu *su)
 {
 
 a2width(const char *p, struct roffsu *su)
 {
 

-       if ( ! a2roffsu(p, su, SCALE_MAX)) {
-               su->unit = SCALE_BU;
+       if (a2roffsu(p, su, SCALE_MAX) < 2) {
+               su->unit = SCALE_EN;

                su->scale = html_strlen(p);
                su->scale = html_strlen(p);

-       }
+       } else if (su->scale < 0.0)
+               su->scale = 0.0;

 }
 
 /*
  * 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 || ! (MDOC_SYNPRETTY & n->flags))


@@ -316,11 +307,11 @@ synopsis_pre(struct html *h, const struct mdoc_node *n)
        case MDOC_In:
                /* FALLTHROUGH */
        case MDOC_Vt:
        case MDOC_In:
                /* FALLTHROUGH */
        case MDOC_Vt:

-               print_otag(h, TAG_P, 0, NULL);
+               print_paragraph(h);

                break;
        case MDOC_Ft:
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
                break;
        case MDOC_Ft:
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {

-                       print_otag(h, TAG_P, 0, NULL);
+                       print_paragraph(h);

                        break;
                }
                /* FALLTHROUGH */
                        break;
                }
                /* FALLTHROUGH */


@@ -330,48 +321,32 @@ synopsis_pre(struct html *h, const struct mdoc_node *n)
        }
 }
 
        }
 }
 

-/*
- * Calculate the scaling unit passed in an `-offset' argument.  This
- * uses either a native scaling unit (e.g., 1i, 2m), one of a set of
- * predefined strings (indent, etc.), or the string length of the value.
- */
-static void
-a2offs(const char *p, struct roffsu *su)
-{
-
-       /* FIXME: "right"? */
-
-       if (0 == strcmp(p, "left"))
-               SCALE_HS_INIT(su, 0);
-       else if (0 == strcmp(p, "indent"))
-               SCALE_HS_INIT(su, INDENT);
-       else if (0 == strcmp(p, "indent-two"))
-               SCALE_HS_INIT(su, INDENT * 2);
-       else if ( ! a2roffsu(p, su, SCALE_MAX))
-               SCALE_HS_INIT(su, html_strlen(p));
-}
-
-static void
-print_mdoc(MDOC_ARGS)
+void
+html_mdoc(void *arg, const struct roff_man *mdoc)

 {
 {

-       struct tag      *t, *tt;

        struct htmlpair  tag;
        struct htmlpair  tag;

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

 
        PAIR_CLASS_INIT(&tag, "mandoc");
 
        PAIR_CLASS_INIT(&tag, "mandoc");

+       h = (struct html *)arg;

 
        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);
 
        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_mdoc_head(&mdoc->meta, mdoc->first->child, 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_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);
+       mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
+       print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);
+       mdoc_root_post(&mdoc->meta, mdoc->first->child, h);

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

+       putchar('\n');

 }
 
 static void
 }
 
 static void


@@ -380,8 +355,9 @@ print_mdoc_head(MDOC_ARGS)
 
        print_gen_head(h);
        bufinit(h);
 
        print_gen_head(h);
        bufinit(h);

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

        if (meta->arch)
                bufcat_fmt(h, " (%s)", meta->arch);
 
        if (meta->arch)
                bufcat_fmt(h, " (%s)", meta->arch);
 


@@ -393,9 +369,10 @@ static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 
 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


@@ -406,12 +383,10 @@ print_mdoc_node(MDOC_ARGS)
 
        child = 1;
        t = h->tags.head;
 
        child = 1;
        t = h->tags.head;

+       n->flags &= ~MDOC_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);
 


@@ -428,10 +403,12 @@ print_mdoc_node(MDOC_ARGS)
                if (MDOC_DELIMO & n->flags)
                        h->flags |= HTML_NOSPACE;
                return;
                if (MDOC_DELIMO & n->flags)
                        h->flags |= HTML_NOSPACE;
                return;

-       case MDOC_EQN:
+       case ROFFT_EQN:
+               if (n->flags & MDOC_LINE)
+                       putchar('\n');

                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


@@ -445,23 +422,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);
                        t = h->tags.head;
                }
                        print_tblclose(h);
                        t = h->tags.head;
                }

-
-               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 & MDOC_LINE) {
+               h->flags &= ~HTML_KEEP;
+               h->flags |= HTML_PREKEEP;

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


@@ -470,14 +443,16 @@ 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 & MDOC_ENDED)
+                       break;
+               (*mdocs[n->tok].post)(meta, n, h);
+               if (n->end != ENDBODY_NOT)
+                       n->body->flags |= MDOC_ENDED;
+               if (n->end == ENDBODY_NOSPACE)
+                       h->flags |= HTML_NOSPACE;

                break;
        }
 }
                break;
        }
 }


@@ -485,29 +460,23 @@ print_mdoc_node(MDOC_ARGS)
 static void
 mdoc_root_post(MDOC_ARGS)
 {
 static void
 mdoc_root_post(MDOC_ARGS)
 {

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

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

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

 
        print_otag(h, TAG_TBODY, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
 
        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);
+       PAIR_CLASS_INIT(&tag, "foot-date");
+       print_otag(h, TAG_TD, 1, &tag);

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

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

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


@@ -515,7 +484,7 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
 static int
 mdoc_root_pre(MDOC_ARGS)
 {

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

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


@@ -525,35 +494,31 @@ mdoc_root_pre(MDOC_ARGS)
                mandoc_asprintf(&volume, "%s (%s)",
                    meta->vol, meta->arch);
 
                mandoc_asprintf(&volume, "%s (%s)",
                    meta->vol, meta->arch);
 

-       mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec);
+       if (NULL == meta->msec)
+               title = mandoc_strdup(meta->title);
+       else
+               mandoc_asprintf(&title, "%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, "head");
+       t = print_otag(h, TAG_TABLE, 1, &tag);

 
        print_otag(h, TAG_TBODY, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
 
        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);
+       PAIR_CLASS_INIT(&tag, "head-ltitle");
+       print_otag(h, TAG_TD, 1, &tag);

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

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

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

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

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


@@ -567,17 +532,23 @@ mdoc_sh_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 {
        struct htmlpair  tag;
 

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

                PAIR_CLASS_INIT(&tag, "section");
                print_otag(h, TAG_DIV, 1, &tag);
                return(1);
                PAIR_CLASS_INIT(&tag, "section");
                print_otag(h, TAG_DIV, 1, &tag);
                return(1);

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

                return(1);
                return(1);

+       default:
+               break;
+       }

 
        bufinit(h);
        bufcat(h, "x");
 
 
        bufinit(h);
        bufcat(h, "x");
 

-       for (n = n->child; n && MDOC_TEXT == n->type; ) {
+       for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {

                bufcat_id(h, n->string);
                if (NULL != (n = n->next))
                        bufcat_id(h, " ");
                bufcat_id(h, n->string);
                if (NULL != (n = n->next))
                        bufcat_id(h, " ");


@@ -597,17 +568,17 @@ mdoc_ss_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 {
        struct htmlpair  tag;
 

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

                PAIR_CLASS_INIT(&tag, "subsection");
                print_otag(h, TAG_DIV, 1, &tag);
                return(1);
                PAIR_CLASS_INIT(&tag, "subsection");
                print_otag(h, TAG_DIV, 1, &tag);
                return(1);

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

                return(1);
 
        bufinit(h);
        bufcat(h, "x");
 
                return(1);
 
        bufinit(h);
        bufcat(h, "x");
 

-       for (n = n->child; n && MDOC_TEXT == n->type; ) {
+       for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {

                bufcat_id(h, n->string);
                if (NULL != (n = n->next))
                        bufcat_id(h, " ");
                bufcat_id(h, n->string);
                if (NULL != (n = n->next))
                        bufcat_id(h, " ");


@@ -637,9 +608,10 @@ mdoc_fl_pre(MDOC_ARGS)
 
        print_text(h, "\\-");
 
 
        print_text(h, "\\-");
 

-       if (n->child)
-               h->flags |= HTML_NOSPACE;
-       else if (n->next && n->next->line == n->line)
+       if ( ! (n->nchild == 0 &&
+           (n->next == NULL ||
+            n->next->type == ROFFT_TEXT ||
+            n->next->flags & MDOC_LINE)))

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


@@ -650,7 +622,7 @@ mdoc_nd_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 {
        struct htmlpair  tag;
 

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

                return(1);
 
        /* XXX: this tag in theory can contain block elements. */
                return(1);
 
        /* XXX: this tag in theory can contain block elements. */


@@ -669,19 +641,19 @@ mdoc_nm_pre(MDOC_ARGS)
        int              len;
 
        switch (n->type) {
        int              len;
 
        switch (n->type) {

-       case MDOC_ELEM:
+       case ROFFT_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);
                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:
+       case ROFFT_HEAD:

                print_otag(h, TAG_TD, 0, NULL);
                if (NULL == n->child && meta->name)
                        print_text(h, meta->name);
                return(1);
                print_otag(h, TAG_TD, 0, NULL);
                if (NULL == n->child && meta->name)
                        print_text(h, meta->name);
                return(1);

-       case MDOC_BODY:
+       case ROFFT_BODY:

                print_otag(h, TAG_TD, 0, NULL);
                return(1);
        default:
                print_otag(h, TAG_TD, 0, NULL);
                return(1);
        default:


@@ -693,13 +665,13 @@ mdoc_nm_pre(MDOC_ARGS)
        print_otag(h, TAG_TABLE, 1, &tag);
 
        for (len = 0, n = n->child; n; n = n->next)
        print_otag(h, TAG_TABLE, 1, &tag);
 
        for (len = 0, n = n->child; n; n = n->next)

-               if (MDOC_TEXT == n->type)
+               if (n->type == ROFFT_TEXT)

                        len += html_strlen(n->string);
 
        if (0 == len && meta->name)
                len = html_strlen(meta->name);
 
                        len += html_strlen(n->string);
 
        if (0 == len && meta->name)
                len = html_strlen(meta->name);
 

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

        bufinit(h);
        bufcat_su(h, "width", &su);
        PAIR_STYLE_INIT(&tag, h);
        bufinit(h);
        bufcat_su(h, "width", &su);
        PAIR_STYLE_INIT(&tag, h);


@@ -839,7 +811,7 @@ mdoc_it_pre(MDOC_ARGS)
        struct roffsu    su;
        enum mdoc_list   type;
        struct htmlpair  tag[2];
        struct roffsu    su;
        enum mdoc_list   type;
        struct htmlpair  tag[2];

-       const struct mdoc_node *bl;
+       const struct roff_node *bl;

 
        bl = n->parent;
        while (bl && MDOC_Bl != bl->tok)
 
        bl = n->parent;
        while (bl && MDOC_Bl != bl->tok)


@@ -854,7 +826,7 @@ mdoc_it_pre(MDOC_ARGS)
 
        bufinit(h);
 
 
        bufinit(h);
 

-       if (MDOC_HEAD == n->type) {
+       if (n->type == ROFFT_HEAD) {

                switch (type) {
                case LIST_bullet:
                        /* FALLTHROUGH */
                switch (type) {
                case LIST_bullet:
                        /* FALLTHROUGH */


@@ -889,7 +861,7 @@ mdoc_it_pre(MDOC_ARGS)
                default:
                        break;
                }
                default:
                        break;
                }

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

                switch (type) {
                case LIST_bullet:
                        /* FALLTHROUGH */
                switch (type) {
                case LIST_bullet:
                        /* FALLTHROUGH */


@@ -953,13 +925,13 @@ mdoc_bl_pre(MDOC_ARGS)
        struct roffsu    su;
        char             buf[BUFSIZ];
 
        struct roffsu    su;
        char             buf[BUFSIZ];
 

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

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

-       if (MDOC_HEAD == n->type) {
+       if (n->type == ROFFT_HEAD) {

                if (LIST_column != n->norm->Bl.type)
                        return(0);
 
                if (LIST_column != n->norm->Bl.type)
                        return(0);
 


@@ -998,7 +970,7 @@ mdoc_bl_pre(MDOC_ARGS)
        /* Set the block's left-hand margin. */
 
        if (n->norm->Bl.offs) {
        /* Set the block's left-hand margin. */
 
        if (n->norm->Bl.offs) {

-               a2offs(n->norm->Bl.offs, &su);
+               a2width(n->norm->Bl.offs, &su);

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


@@ -1053,7 +1025,7 @@ mdoc_ex_pre(MDOC_ARGS)
 
        nchild = n->nchild;
        for (n = n->child; n; n = n->next) {
 
        nchild = n->nchild;
        for (n = n->child; n; n = n->next) {

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

 
                t = print_otag(h, TAG_B, 1, &tag);
                print_text(h, n->string);
 
                t = print_otag(h, TAG_B, 1, &tag);
                print_text(h, n->string);


@@ -1093,7 +1065,7 @@ mdoc_d1_pre(MDOC_ARGS)
        struct htmlpair  tag[2];
        struct roffsu    su;
 
        struct htmlpair  tag[2];
        struct roffsu    su;
 

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

                return(1);
 
        SCALE_VS_INIT(&su, 0);
                return(1);
 
        SCALE_VS_INIT(&su, 0);


@@ -1143,16 +1115,16 @@ mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
        int                      comp, sv;
 {
        struct htmlpair          tag[2];
        int                      comp, sv;

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

        struct roffsu            su;
 
        struct roffsu            su;
 

-       if (MDOC_HEAD == n->type)
+       if (n->type == ROFFT_HEAD)

                return(0);
 
                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;


@@ -1160,13 +1132,21 @@ mdoc_bd_pre(MDOC_ARGS)
                                break;
                }
                if ( ! comp)
                                break;
                }
                if ( ! comp)

-                       print_otag(h, TAG_P, 0, NULL);
+                       print_paragraph(h);

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

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

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


@@ -1215,7 +1195,8 @@ mdoc_bd_pre(MDOC_ARGS)
                default:
                        break;
                }
                default:
                        break;
                }

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

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


@@ -1254,7 +1235,22 @@ mdoc_an_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       /* TODO: -split and -nosplit (see termp_an_pre()). */
+       if (n->norm->An.auth == AUTH_split) {
+               h->flags &= ~HTML_NOSPLIT;
+               h->flags |= HTML_SPLIT;
+               return(0);
+       }
+       if (n->norm->An.auth == AUTH_nosplit) {
+               h->flags &= ~HTML_SPLIT;
+               h->flags |= HTML_NOSPLIT;
+               return(0);
+       }
+
+       if (h->flags & HTML_SPLIT)
+               print_otag(h, TAG_BR, 0, NULL);
+
+       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);
 
        PAIR_CLASS_INIT(&tag, "author");
        print_otag(h, TAG_SPAN, 1, &tag);


@@ -1305,7 +1301,7 @@ mdoc_er_pre(MDOC_ARGS)
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {

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

        struct htmlpair          tag;
        struct tag              *t;
 
        struct htmlpair          tag;
        struct tag              *t;
 


@@ -1347,7 +1343,7 @@ mdoc_fd_pre(MDOC_ARGS)
        if (NULL == (n = n->child))
                return(0);
 
        if (NULL == (n = n->child))
                return(0);
 

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

 
        if (strcmp(n->string, "#include")) {
                PAIR_CLASS_INIT(&tag[0], "macro");
 
        if (strcmp(n->string, "#include")) {
                PAIR_CLASS_INIT(&tag[0], "macro");


@@ -1360,7 +1356,7 @@ mdoc_fd_pre(MDOC_ARGS)
        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);
+               assert(n->type == ROFFT_TEXT);

 
                /*
                 * XXX This is broken and not easy to fix.
 
                /*
                 * XXX This is broken and not easy to fix.


@@ -1394,7 +1390,7 @@ 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);
        }
 


@@ -1406,12 +1402,12 @@ mdoc_vt_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 {
        struct htmlpair  tag;
 

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

                synopsis_pre(h, n);
                return(1);
                synopsis_pre(h, n);
                return(1);

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

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

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

                return(0);
 
        PAIR_CLASS_INIT(&tag, "type");
                return(0);
 
        PAIR_CLASS_INIT(&tag, "type");


@@ -1548,7 +1544,7 @@ static int
 mdoc_pp_pre(MDOC_ARGS)
 {
 
 mdoc_pp_pre(MDOC_ARGS)
 {
 

-       print_otag(h, TAG_P, 0, NULL);
+       print_paragraph(h);

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


@@ -1561,11 +1557,14 @@ 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 (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
        } else

-               su.scale = 0;
+               su.scale = 0.0;

 
        bufinit(h);
        bufcat_su(h, "height", &su);
 
        bufinit(h);
        bufcat_su(h, "height", &su);


@@ -1587,7 +1586,7 @@ mdoc_lk_pre(MDOC_ARGS)
        if (NULL == (n = n->child))
                return(0);
 
        if (NULL == (n = n->child))
                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);
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");
        PAIR_HREF_INIT(&tag[1], n->string);


@@ -1612,7 +1611,7 @@ mdoc_mt_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[0], "link-mail");
 
        for (n = n->child; n; n = n->next) {
        PAIR_CLASS_INIT(&tag[0], "link-mail");
 
        for (n = n->child; n; n = n->next) {

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

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


@@ -1633,12 +1632,12 @@ mdoc_fo_pre(MDOC_ARGS)
        struct htmlpair  tag;
        struct tag      *t;
 
        struct htmlpair  tag;
        struct tag      *t;
 

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

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

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

                synopsis_pre(h, n);
                return(1);
        }
                synopsis_pre(h, n);
                return(1);
        }


@@ -1659,7 +1658,7 @@ static void
 mdoc_fo_post(MDOC_ARGS)
 {
 
 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, ")");


@@ -1693,7 +1692,7 @@ mdoc_in_pre(MDOC_ARGS)
        h->flags |= HTML_NOSPACE;
 
        if (NULL != (n = n->child)) {
        h->flags |= HTML_NOSPACE;
 
        if (NULL != (n = n->child)) {

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

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


@@ -1715,7 +1714,7 @@ 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);
        }
 


@@ -1814,9 +1813,9 @@ mdoc_bf_pre(MDOC_ARGS)
        struct htmlpair  tag[2];
        struct roffsu    su;
 
        struct htmlpair  tag[2];
        struct roffsu    su;
 

-       if (MDOC_HEAD == n->type)
+       if (n->type == ROFFT_HEAD)

                return(0);
                return(0);

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

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


@@ -1864,7 +1863,8 @@ static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
 mdoc_pf_post(MDOC_ARGS)
 {
 

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

 }
 
 static int
 }
 
 static int


@@ -1872,17 +1872,27 @@ mdoc_rs_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 {
        struct htmlpair  tag;
 

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

                return(1);
 
        if (n->prev && SEC_SEE_ALSO == n->sec)
                return(1);
 
        if (n->prev && SEC_SEE_ALSO == n->sec)

-               print_otag(h, TAG_P, 0, NULL);
+               print_paragraph(h);

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

+static int
+mdoc_no_pre(MDOC_ARGS)
+{
+       struct htmlpair tag;
+
+       PAIR_CLASS_INIT(&tag, "none");
+       print_otag(h, TAG_CODE, 1, &tag);
+       return(1);
+}
+

 static int
 mdoc_li_pre(MDOC_ARGS)
 {
 static int
 mdoc_li_pre(MDOC_ARGS)
 {


@@ -2028,11 +2038,11 @@ mdoc_bk_pre(MDOC_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                break;
                break;

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                return(0);
                return(0);

-       case MDOC_BODY:
+       case ROFFT_BODY:

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


@@ -2048,7 +2058,7 @@ static void
 mdoc_bk_post(MDOC_ARGS)
 {
 
 mdoc_bk_post(MDOC_ARGS)
 {
 

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

                h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }
 
                h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }
 


@@ -2057,14 +2067,15 @@ mdoc_quote_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

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

                return(1);
 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
                return(1);
 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:

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

                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */


@@ -2090,8 +2101,6 @@ mdoc_quote_pre(MDOC_ARGS)
                        return(1);
                print_text(h, n->norm->Es->child->string);
                break;
                        return(1);
                print_text(h, n->norm->Es->child->string);
                break;

-       case MDOC_Eo:
-               break;

        case MDOC_Do:
                /* FALLTHROUGH */
        case MDOC_Dq:
        case MDOC_Do:
                /* FALLTHROUGH */
        case MDOC_Dq:


@@ -2130,17 +2139,17 @@ static void
 mdoc_quote_post(MDOC_ARGS)
 {
 
 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:
                /* FALLTHROUGH */
        case MDOC_Aq:
 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:

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

                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */


@@ -2157,14 +2166,12 @@ mdoc_quote_post(MDOC_ARGS)
                print_text(h, "\\(rB");
                break;
        case MDOC_En:
                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:
                /* FALLTHROUGH */
                break;
        case MDOC_Qo:
                /* FALLTHROUGH */


@@ -2192,3 +2199,44 @@ mdoc_quote_post(MDOC_ARGS)
                /* NOTREACHED */
        }
 }
                /* 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;
+}