On a new RS nesting level, the saved width starts from the default

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index d9c2cd31eafd8ff71206e15a42516c241a21cd07..51de28fd7e5259d46d454a2aaaabc2752b6aeea3 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,22 +1,21 @@
-/*     $Id: man_html.c,v 1.71 2011/05/17 11:19:45 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.115 2015/04/02 23:48:19 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 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>
 


@@ -26,20 +25,20 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "roff.h"
+#include "man.h"

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

-#include "man.h"

 #include "main.h"
 
 /* TODO: preserve ident widths. */
 /* FIXME: have PD set the default vspace width. */
 
 #define        INDENT            5
 #include "main.h"
 
 /* TODO: preserve ident widths. */
 /* FIXME: have PD set the default vspace width. */
 
 #define        INDENT            5

-#define        HALFINDENT        3

 
 

-#define        MAN_ARGS          const struct man_meta *m, \
-                         const struct man_node *n, \
+#define        MAN_ARGS          const struct roff_meta *man, \
+                         const struct roff_node *n, \

                          struct mhtml *mh, \
                          struct html *h
 
                          struct mhtml *mh, \
                          struct html *h
 


@@ -53,30 +52,32 @@ struct      htmlman {
        int             (*post)(MAN_ARGS);
 };
 
        int             (*post)(MAN_ARGS);
 };
 

+static void              print_bvspace(struct html *,
+                               const struct roff_node *);

 static void              print_man(MAN_ARGS);
 static void              print_man_head(MAN_ARGS);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
 static void              print_man(MAN_ARGS);
 static void              print_man_head(MAN_ARGS);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);

-
-static int               a2width(const struct man_node *,
+static int               a2width(const struct roff_node *,

                                struct roffsu *);
                                struct roffsu *);

-
-static int               man_alt_pre(MAN_ARGS);
-static int               man_br_pre(MAN_ARGS);
-static int               man_ign_pre(MAN_ARGS);
-static int               man_in_pre(MAN_ARGS);
-static int               man_literal_pre(MAN_ARGS);
-static void              man_root_post(MAN_ARGS);
-static void              man_root_pre(MAN_ARGS);

 static int               man_B_pre(MAN_ARGS);
 static int               man_HP_pre(MAN_ARGS);
 static int               man_B_pre(MAN_ARGS);
 static int               man_HP_pre(MAN_ARGS);

-static int               man_I_pre(MAN_ARGS);

 static int               man_IP_pre(MAN_ARGS);
 static int               man_IP_pre(MAN_ARGS);

+static int               man_I_pre(MAN_ARGS);
+static int               man_OP_pre(MAN_ARGS);

 static int               man_PP_pre(MAN_ARGS);
 static int               man_RS_pre(MAN_ARGS);
 static int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);
 static int               man_PP_pre(MAN_ARGS);
 static int               man_RS_pre(MAN_ARGS);
 static int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);

+static int               man_UR_pre(MAN_ARGS);
+static int               man_alt_pre(MAN_ARGS);
+static int               man_br_pre(MAN_ARGS);
+static int               man_ign_pre(MAN_ARGS);
+static int               man_in_pre(MAN_ARGS);
+static int               man_literal_pre(MAN_ARGS);
+static void              man_root_post(MAN_ARGS);
+static void              man_root_pre(MAN_ARGS);

 
 static const struct htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */
 
 static const struct htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */


@@ -88,7 +89,7 @@ static        const struct htmlman mans[MAN_MAX] = {
        { man_PP_pre, NULL }, /* PP */
        { man_PP_pre, NULL }, /* P */
        { man_IP_pre, NULL }, /* IP */
        { man_PP_pre, NULL }, /* PP */
        { man_PP_pre, NULL }, /* P */
        { man_IP_pre, NULL }, /* IP */

-       { man_HP_pre, NULL }, /* HP */ 
+       { man_HP_pre, NULL }, /* HP */

        { man_SM_pre, NULL }, /* SM */
        { man_SM_pre, NULL }, /* SB */
        { man_alt_pre, NULL }, /* BI */
        { man_SM_pre, NULL }, /* SM */
        { man_SM_pre, NULL }, /* SB */
        { man_alt_pre, NULL }, /* BI */


@@ -100,7 +101,6 @@ static      const struct htmlman mans[MAN_MAX] = {
        { man_I_pre, NULL }, /* I */
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */
        { man_I_pre, NULL }, /* I */
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */

-       { man_ign_pre, NULL }, /* na */

        { man_br_pre, NULL }, /* sp */
        { man_literal_pre, NULL }, /* nf */
        { man_literal_pre, NULL }, /* fi */
        { man_br_pre, NULL }, /* sp */
        { man_literal_pre, NULL }, /* nf */
        { man_literal_pre, NULL }, /* fi */


@@ -112,116 +112,123 @@ static  const struct htmlman mans[MAN_MAX] = {
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */
        { man_ign_pre, NULL }, /* ft */
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */
        { man_ign_pre, NULL }, /* ft */

+       { man_OP_pre, NULL }, /* OP */
+       { man_literal_pre, NULL }, /* EX */
+       { man_literal_pre, NULL }, /* EE */
+       { man_UR_pre, NULL }, /* UR */
+       { NULL, NULL }, /* UE */
+       { man_ign_pre, NULL }, /* ll */

 };
 
 
 };
 
 

-void
-html_man(void *arg, const struct man *m)
+/*
+ * Printing leading vertical space before a block.
+ * This is used for the paragraph macros.
+ * The rules are pretty simple, since there's very little nesting going
+ * on here.  Basically, if we're the first within another block (SS/SH),
+ * then don't emit vertical space.  If we are (RS), then do.  If not the
+ * first, print it.
+ */
+static void
+print_bvspace(struct html *h, const struct roff_node *n)

 {
 {

-       struct html     *h;
-       struct tag      *t;
-       struct mhtml     mh;

 
 

-       h = (struct html *)arg;
+       if (n->body && n->body->child)
+               if (n->body->child->type == ROFFT_TBL)
+                       return;

 
 

-       print_gen_decls(h);
+       if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)
+               if (NULL == n->prev)
+                       return;

 
 

-       memset(&mh, 0, sizeof(struct mhtml));
+       print_paragraph(h);
+}

 
 

-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_man(man_meta(m), man_node(m), &mh, h);
-       print_tagq(h, t);
+void
+html_man(void *arg, const struct man *man)
+{
+       struct mhtml     mh;

 
 

-       printf("\n");
+       memset(&mh, 0, sizeof(struct mhtml));
+       print_man(man_meta(man), man_node(man), &mh, (struct html *)arg);
+       putchar('\n');

 }
 
 }
 

-

 static void
 static void

-print_man(MAN_ARGS) 
+print_man(MAN_ARGS)

 {
 {

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

 
 

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

 
 

-       t = print_otag(h, TAG_BODY, 0, NULL);
-       print_man_nodelist(m, n, mh, 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_man_head(man, n, mh, 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_man_nodelist(man, n, mh, h);

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

-
-/* ARGSUSED */

 static void
 print_man_head(MAN_ARGS)
 {
 
        print_gen_head(h);
 static void
 print_man_head(MAN_ARGS)
 {
 
        print_gen_head(h);

-       bufinit(h);
-       bufcat_fmt(h, "%s(%s)", m->title, m->msec);
-
+       assert(man->title);
+       assert(man->msec);
+       bufcat_fmt(h, "%s(%s)", man->title, man->msec);

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

-

 static void
 print_man_nodelist(MAN_ARGS)
 {
 
 static void
 print_man_nodelist(MAN_ARGS)
 {
 

-       print_man_node(m, n, mh, h);
-       if (n->next)
-               print_man_nodelist(m, n->next, mh, h);
+       while (n != NULL) {
+               print_man_node(man, n, mh, h);
+               n = n->next;
+       }

 }
 
 }
 

-

 static void
 print_man_node(MAN_ARGS)
 {
        int              child;
        struct tag      *t;
 static void
 print_man_node(MAN_ARGS)
 {
        int              child;
        struct tag      *t;

-       struct htmlpair  tag;

 
        child = 1;
        t = h->tags.head;
 
        child = 1;
        t = h->tags.head;

-       bufinit(h);

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

-       case (MAN_ROOT):
-               man_root_pre(m, n, mh, h);
+       case ROFFT_ROOT:
+               man_root_pre(man, n, mh, h);

                break;
                break;

-       case (MAN_TEXT):
-               /*
-                * If we have a blank line, output a vertical space.
-                * If we have a space as the first character, break
-                * before printing the line's data.
-                */
+       case ROFFT_TEXT:

                if ('\0' == *n->string) {
                if ('\0' == *n->string) {

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

                        return;
                        return;

-               } else if (' ' == *n->string && MAN_LINE & n->flags)
+               }
+               if (n->flags & MAN_LINE && (*n->string == ' ' ||
+                   (n->prev != NULL && mh->fl & MANH_LITERAL &&
+                    ! (h->flags & HTML_NONEWLINE))))

                        print_otag(h, TAG_BR, 0, NULL);
                        print_otag(h, TAG_BR, 0, NULL);

-

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

-
-               /*
-                * If we're in a literal context, make sure that words
-                * togehter on the same line stay together.  This is a
-                * POST-printing call, so we check the NEXT word.  Since
-                * -man doesn't have nested macros, we don't need to be
-                * more specific than this.
-                */
-               if (MANH_LITERAL & mh->fl &&
-                               (NULL == n->next ||
-                                n->next->line > n->line))
-                       print_otag(h, TAG_BR, 0, NULL);

                return;
                return;

-       case (MAN_EQN):
-               PAIR_CLASS_INIT(&tag, "eqn");
-               print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, n->eqn->data);
+       case ROFFT_EQN:
+               if (n->flags & MAN_LINE)
+                       putchar('\n');
+               print_eqn(h, n->eqn);

                break;
                break;

-       case (MAN_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


@@ -230,7 +237,7 @@ print_man_node(MAN_ARGS)
                print_tbl(h, n->span);
                return;
        default:
                print_tbl(h, n->span);
                return;
        default:

-               /* 
+               /*

                 * Close out scope of font prior to opening a macro
                 * scope.
                 */
                 * Close out scope of font prior to opening a macro
                 * scope.
                 */


@@ -249,144 +256,104 @@ print_man_node(MAN_ARGS)
                        t = h->tags.head;
                }
                if (mans[n->tok].pre)
                        t = h->tags.head;
                }
                if (mans[n->tok].pre)

-                       child = (*mans[n->tok].pre)(m, n, mh, h);
+                       child = (*mans[n->tok].pre)(man, n, mh, h);

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

-               print_man_nodelist(m, n->child, mh, h);
+               print_man_nodelist(man, n->child, mh, h);

 
        /* This will automatically close out any font scope. */
        print_stagq(h, t);
 
 
        /* This will automatically close out any font scope. */
        print_stagq(h, t);
 

-       bufinit(h);
-

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

-       case (MAN_ROOT):
-               man_root_post(m, n, mh, h);
+       case ROFFT_ROOT:
+               man_root_post(man, n, mh, h);

                break;
                break;

-       case (MAN_EQN):
+       case ROFFT_EQN:

                break;
        default:
                if (mans[n->tok].post)
                break;
        default:
                if (mans[n->tok].post)

-                       (*mans[n->tok].post)(m, n, mh, h);
+                       (*mans[n->tok].post)(man, n, mh, h);

                break;
        }
 }
 
                break;
        }
 }
 

-

 static int
 static int

-a2width(const struct man_node *n, struct roffsu *su)
+a2width(const struct roff_node *n, struct roffsu *su)

 {
 
 {
 

-       if (MAN_TEXT != n->type)
+       if (n->type != ROFFT_TEXT)

                return(0);
                return(0);

-       if (a2roffsu(n->string, su, SCALE_BU))
+       if (a2roffsu(n->string, su, SCALE_EN))

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

-
-/* ARGSUSED */

 static void
 man_root_pre(MAN_ARGS)
 {
 static void
 man_root_pre(MAN_ARGS)
 {

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

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

-       char             b[BUFSIZ], title[BUFSIZ];
-
-       b[0] = 0;
-       if (m->vol)
-               (void)strlcat(b, m->vol, BUFSIZ);
-
-       snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
-
-       PAIR_SUMMARY_INIT(&tag[0], "Document Header");
-       PAIR_CLASS_INIT(&tag[1], "head");
-       if (NULL == h->style) {
-               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);
-       } else
-               t = print_otag(h, TAG_TABLE, 2, tag);
+       char            *title;
+
+       assert(man->title);
+       assert(man->msec);
+       mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);
+
+       PAIR_CLASS_INIT(&tag, "head");
+       t = print_otag(h, TAG_TABLE, 1, &tag);

 
        print_otag(h, TAG_TBODY, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
 
        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");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
-
-       print_text(h, b);
+       PAIR_CLASS_INIT(&tag, "head-vol");
+       print_otag(h, TAG_TD, 1, &tag);
+       if (NULL != man->vol)
+               print_text(h, man->vol);

        print_stagq(h, tt);
 
        print_stagq(h, tt);
 

-       PAIR_CLASS_INIT(&tag[0], "head-rtitle");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, 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);

+       free(title);

 }
 
 }
 

-
-/* ARGSUSED */

 static void
 man_root_post(MAN_ARGS)
 {
 static void
 man_root_post(MAN_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");
-       if (NULL == h->style) {
-               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);
-       } else
-               t = print_otag(h, TAG_TABLE, 2, tag);
+       PAIR_CLASS_INIT(&tag, "foot");
+       t = print_otag(h, TAG_TABLE, 1, &tag);

 
        tt = print_otag(h, TAG_TR, 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, m->date);
+       assert(man->date);
+       print_text(h, man->date);

        print_stagq(h, tt);
 
        print_stagq(h, tt);
 

-       PAIR_CLASS_INIT(&tag[0], "foot-os");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
+       PAIR_CLASS_INIT(&tag, "foot-os");
+       print_otag(h, TAG_TD, 1, &tag);

 
 

-       if (m->source)
-               print_text(h, m->source);
+       if (man->os)
+               print_text(h, man->os);

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

-
-/* ARGSUSED */

 static int
 man_br_pre(MAN_ARGS)
 {
 static int
 man_br_pre(MAN_ARGS)
 {


@@ -396,11 +363,13 @@ man_br_pre(MAN_ARGS)
        SCALE_VS_INIT(&su, 1);
 
        if (MAN_sp == n->tok) {
        SCALE_VS_INIT(&su, 1);
 
        if (MAN_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))
+                               su.scale = 1.0;

        } else
        } else

-               su.scale = 0;
+               su.scale = 0.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);


@@ -411,53 +380,55 @@ man_br_pre(MAN_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static int
 man_SH_pre(MAN_ARGS)
 {
        struct htmlpair  tag;
 
 static int
 man_SH_pre(MAN_ARGS)
 {
        struct htmlpair  tag;
 

-       if (MAN_BLOCK == n->type) {
+       if (n->type == ROFFT_BLOCK) {
+               mh->fl &= ~MANH_LITERAL;

                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 (MAN_BODY == n->type)
+       } else if (n->type == ROFFT_BODY)

                return(1);
 
        print_otag(h, TAG_H1, 0, NULL);
        return(1);
 }
 
                return(1);
 
        print_otag(h, TAG_H1, 0, NULL);
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 man_alt_pre(MAN_ARGS)
 {
 static int
 man_alt_pre(MAN_ARGS)
 {

-       const struct man_node   *nn;
-       int              i;
+       const struct roff_node  *nn;
+       int              i, savelit;

        enum htmltag     fp;
        struct tag      *t;
 
        enum htmltag     fp;
        struct tag      *t;
 

+       if ((savelit = mh->fl & MANH_LITERAL))
+               print_otag(h, TAG_BR, 0, NULL);
+
+       mh->fl &= ~MANH_LITERAL;
+

        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                t = NULL;
                switch (n->tok) {
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                t = NULL;
                switch (n->tok) {

-               case (MAN_BI):
+               case MAN_BI:

                        fp = i % 2 ? TAG_I : TAG_B;
                        break;
                        fp = i % 2 ? TAG_I : TAG_B;
                        break;

-               case (MAN_IB):
+               case MAN_IB:

                        fp = i % 2 ? TAG_B : TAG_I;
                        break;
                        fp = i % 2 ? TAG_B : TAG_I;
                        break;

-               case (MAN_RI):
+               case MAN_RI:

                        fp = i % 2 ? TAG_I : TAG_MAX;
                        break;
                        fp = i % 2 ? TAG_I : TAG_MAX;
                        break;

-               case (MAN_IR):
+               case MAN_IR:

                        fp = i % 2 ? TAG_MAX : TAG_I;
                        break;
                        fp = i % 2 ? TAG_MAX : TAG_I;
                        break;

-               case (MAN_BR):
+               case MAN_BR:

                        fp = i % 2 ? TAG_MAX : TAG_B;
                        break;
                        fp = i % 2 ? TAG_MAX : TAG_B;
                        break;

-               case (MAN_RB):
+               case MAN_RB:

                        fp = i % 2 ? TAG_B : TAG_MAX;
                        break;
                default:
                        fp = i % 2 ? TAG_B : TAG_MAX;
                        break;
                default:


@@ -471,170 +442,152 @@ man_alt_pre(MAN_ARGS)
                if (TAG_MAX != fp)
                        t = print_otag(h, fp, 0, NULL);
 
                if (TAG_MAX != fp)
                        t = print_otag(h, fp, 0, NULL);
 

-               print_man_node(m, nn, mh, h);
+               print_man_node(man, nn, mh, h);

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

+       if (savelit)
+               mh->fl |= MANH_LITERAL;
+

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

-
-/* ARGSUSED */

 static int
 man_SM_pre(MAN_ARGS)
 {
 static int
 man_SM_pre(MAN_ARGS)
 {

-       
+

        print_otag(h, TAG_SMALL, 0, NULL);
        if (MAN_SB == n->tok)
                print_otag(h, TAG_B, 0, NULL);
        return(1);
 }
 
        print_otag(h, TAG_SMALL, 0, NULL);
        if (MAN_SB == n->tok)
                print_otag(h, TAG_B, 0, NULL);
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 man_SS_pre(MAN_ARGS)
 {
        struct htmlpair  tag;
 
 static int
 man_SS_pre(MAN_ARGS)
 {
        struct htmlpair  tag;
 

-       if (MAN_BLOCK == n->type) {
+       if (n->type == ROFFT_BLOCK) {
+               mh->fl &= ~MANH_LITERAL;

                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 (MAN_BODY == n->type)
+       } else if (n->type == ROFFT_BODY)

                return(1);
 
        print_otag(h, TAG_H2, 0, NULL);
        return(1);
 }
 
                return(1);
 
        print_otag(h, TAG_H2, 0, NULL);
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 man_PP_pre(MAN_ARGS)
 {
 
 static int
 man_PP_pre(MAN_ARGS)
 {
 

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

                return(0);
                return(0);

-       else if (MAN_BODY == n->type && n->prev)
-               print_otag(h, TAG_P, 0, NULL);
+       else if (n->type == ROFFT_BLOCK)
+               print_bvspace(h, n);

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

-
-/* ARGSUSED */

 static int
 man_IP_pre(MAN_ARGS)
 {
 static int
 man_IP_pre(MAN_ARGS)
 {

-       struct roffsu            su;
-       struct htmlpair          tag;
-       const struct man_node   *nn;
-
-       /*
-        * This scattering of 1-BU margins and pads is to make sure that
-        * when text overruns its box, the subsequent text isn't flush
-        * up against it.  However, the rest of the right-hand box must
-        * also be adjusted in consideration of this 1-BU space.
-        */
-
-       if (MAN_BODY == n->type) { 
-               print_otag(h, TAG_TD, 0, NULL);
-               return(1);
-       }
-
-       nn = MAN_BLOCK == n->type ? 
-               n->head->child : n->parent->head->child;
-
-       SCALE_HS_INIT(&su, INDENT);
+       const struct roff_node  *nn;

 
 

-       /* Width is the second token. */
-
-       if (MAN_IP == n->tok && NULL != nn)
-               if (NULL != (nn = nn->next))
-                       a2width(nn, &su);
-
-       /* Width is the first token. */
-
-       if (MAN_TP == n->tok && NULL != nn) {
-               /* Skip past non-text children. */
-               while (nn && MAN_TEXT != nn->type)
-                       nn = nn->next;
-               if (nn)
-                       a2width(nn, &su);
+       if (n->type == ROFFT_BODY) {
+               print_otag(h, TAG_DD, 0, NULL);
+               return(1);
+       } else if (n->type != ROFFT_HEAD) {
+               print_otag(h, TAG_DL, 0, NULL);
+               return(1);

        }
 
        }
 

-       if (MAN_BLOCK == n->type) {
-               print_otag(h, TAG_P, 0, NULL);
-               print_otag(h, TAG_TABLE, 0, NULL);
-               bufcat_su(h, "width", &su);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_COL, 1, &tag);
-               print_otag(h, TAG_COL, 0, NULL);
-               print_otag(h, TAG_TBODY, 0, NULL);
-               print_otag(h, TAG_TR, 0, NULL);
-               return(1);
-       } 
+       /* FIXME: width specification. */

 
 

-       print_otag(h, TAG_TD, 0, NULL);
+       print_otag(h, TAG_DT, 0, NULL);

 
        /* For IP, only print the first header element. */
 
        if (MAN_IP == n->tok && n->child)
 
        /* For IP, only print the first header element. */
 
        if (MAN_IP == n->tok && n->child)

-               print_man_node(m, n->child, mh, h);
+               print_man_node(man, n->child, mh, h);

 
        /* For TP, only print next-line header elements. */
 
 
        /* For TP, only print next-line header elements. */
 

-       if (MAN_TP == n->tok)
-               for (nn = n->child; nn; nn = nn->next)
-                       if (nn->line > n->line)
-                               print_man_node(m, nn, mh, h);
+       if (MAN_TP == n->tok) {
+               nn = n->child;
+               while (NULL != nn && 0 == (MAN_LINE & nn->flags))
+                       nn = nn->next;
+               while (NULL != nn) {
+                       print_man_node(man, nn, mh, h);
+                       nn = nn->next;
+               }
+       }

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

-
-/* ARGSUSED */

 static int
 man_HP_pre(MAN_ARGS)
 {
 static int
 man_HP_pre(MAN_ARGS)
 {

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

        struct roffsu    su;
        struct roffsu    su;

-       const struct man_node *np;
+       const struct roff_node *np;
+
+       if (n->type == ROFFT_HEAD)
+               return(0);
+       else if (n->type != ROFFT_BLOCK)
+               return(1);

 
 

-       np = MAN_BLOCK == n->type ? 
-               n->head->child : 
-               n->parent->head->child;
+       np = n->head->child;

 
        if (NULL == np || ! a2width(np, &su))
                SCALE_HS_INIT(&su, INDENT);
 
 
        if (NULL == np || ! a2width(np, &su))
                SCALE_HS_INIT(&su, INDENT);
 

-       if (MAN_HEAD == n->type) {
-               print_otag(h, TAG_TD, 0, NULL);
-               return(0);
-       } else if (MAN_BLOCK == n->type) {
-               print_otag(h, TAG_P, 0, NULL);
-               print_otag(h, TAG_TABLE, 0, NULL);
-               bufcat_su(h, "width", &su);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_COL, 1, &tag);
-               print_otag(h, TAG_COL, 0, NULL);
-               print_otag(h, TAG_TBODY, 0, NULL);
-               print_otag(h, TAG_TR, 0, NULL);
-               return(1);
-       }
+       bufinit(h);

 
 

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

        su.scale = -su.scale;
        bufcat_su(h, "text-indent", &su);
        su.scale = -su.scale;
        bufcat_su(h, "text-indent", &su);

-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_TD, 1, &tag);
+       PAIR_STYLE_INIT(&tag[0], h);
+       PAIR_CLASS_INIT(&tag[1], "spacer");
+       print_otag(h, TAG_DIV, 2, tag);

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

+static int
+man_OP_pre(MAN_ARGS)
+{
+       struct tag      *tt;
+       struct htmlpair  tag;
+
+       print_text(h, "[");
+       h->flags |= HTML_NOSPACE;
+       PAIR_CLASS_INIT(&tag, "opt");
+       tt = print_otag(h, TAG_SPAN, 1, &tag);
+
+       if (NULL != (n = n->child)) {
+               print_otag(h, TAG_B, 0, NULL);
+               print_text(h, n->string);
+       }
+
+       print_stagq(h, tt);
+
+       if (NULL != n && NULL != n->next) {
+               print_otag(h, TAG_I, 0, NULL);
+               print_text(h, n->next->string);
+       }
+
+       print_stagq(h, tt);
+       h->flags |= HTML_NOSPACE;
+       print_text(h, "]");
+       return(0);
+}

 
 

-/* ARGSUSED */

 static int
 man_B_pre(MAN_ARGS)
 {
 static int
 man_B_pre(MAN_ARGS)
 {


@@ -643,33 +596,27 @@ man_B_pre(MAN_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 man_I_pre(MAN_ARGS)
 {
 static int
 man_I_pre(MAN_ARGS)
 {

-       
+

        print_otag(h, TAG_I, 0, NULL);
        return(1);
 }
 
        print_otag(h, TAG_I, 0, NULL);
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 man_literal_pre(MAN_ARGS)
 {
 
 static int
 man_literal_pre(MAN_ARGS)
 {
 

-       if (MAN_nf == n->tok) {
+       if (MAN_fi == n->tok || MAN_EE == n->tok) {

                print_otag(h, TAG_BR, 0, NULL);
                print_otag(h, TAG_BR, 0, NULL);

-               mh->fl |= MANH_LITERAL;
-       } else

                mh->fl &= ~MANH_LITERAL;
                mh->fl &= ~MANH_LITERAL;

+       } else
+               mh->fl |= MANH_LITERAL;

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

-
-/* ARGSUSED */

 static int
 man_in_pre(MAN_ARGS)
 {
 static int
 man_in_pre(MAN_ARGS)
 {


@@ -678,8 +625,6 @@ man_in_pre(MAN_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static int
 man_ign_pre(MAN_ARGS)
 {
 static int
 man_ign_pre(MAN_ARGS)
 {


@@ -687,25 +632,47 @@ man_ign_pre(MAN_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static int
 man_RS_pre(MAN_ARGS)
 {
        struct htmlpair  tag;
        struct roffsu    su;
 
 static int
 man_RS_pre(MAN_ARGS)
 {
        struct htmlpair  tag;
        struct roffsu    su;
 

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

                return(0);
                return(0);

-       else if (MAN_BODY == n->type)
+       else if (n->type == ROFFT_BODY)

                return(1);
 
        SCALE_HS_INIT(&su, INDENT);
        if (n->head->child)
                a2width(n->head->child, &su);
 
                return(1);
 
        SCALE_HS_INIT(&su, INDENT);
        if (n->head->child)
                a2width(n->head->child, &su);
 

+       bufinit(h);

        bufcat_su(h, "margin-left", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
        return(1);
 }
        bufcat_su(h, "margin-left", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
        return(1);
 }

+
+static int
+man_UR_pre(MAN_ARGS)
+{
+       struct htmlpair          tag[2];
+
+       n = n->child;
+       assert(n->type == ROFFT_HEAD);
+       if (n->nchild) {
+               assert(n->child->type == ROFFT_TEXT);
+               PAIR_CLASS_INIT(&tag[0], "link-ext");
+               PAIR_HREF_INIT(&tag[1], n->child->string);
+               print_otag(h, TAG_A, 2, tag);
+       }
+
+       assert(n->next->type == ROFFT_BODY);
+       if (n->next->nchild)
+               n = n->next;
+
+       print_man_nodelist(man, n->child, mh, h);
+
+       return(0);
+}