Explicit block closure macros clobber next-line block head scope,

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index d42bebb5e3228b11f0d78013227e6d84c0b0d701..1455e1e4aec9bcc4970466d754a45888d646c154 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,6 +1,7 @@
-/*     $Id: man_html.c,v 1.8 2009/10/08 23:00:15 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.107 2014/12/04 02:05:42 schwarze Exp $ */

 /*
 /*

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


@@ -14,61 +15,68 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#include "config.h"
+

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

-#include <sys/queue.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

+#include "mandoc_aux.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. */
 
 /* TODO: preserve ident widths. */

+/* FIXME: have PD set the default vspace width. */

 
 #define        INDENT            5
 
 #define        INDENT            5

-#define        HALFINDENT        3

 
 

-#define        MAN_ARGS          const struct man_meta *m, \
+#define        MAN_ARGS          const struct man_meta *man, \

                          const struct man_node *n, \
                          const struct man_node *n, \

+                         struct mhtml *mh, \

                          struct html *h
 
                          struct html *h
 

+struct mhtml {
+       int               fl;
+#define        MANH_LITERAL     (1 << 0) /* literal context */
+};
+

 struct htmlman {
        int             (*pre)(MAN_ARGS);
        int             (*post)(MAN_ARGS);
 };
 
 struct htmlman {
        int             (*pre)(MAN_ARGS);
        int             (*post)(MAN_ARGS);
 };
 

+static void              print_bvspace(struct html *,
+                               const struct man_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 *,
                                struct roffsu *);
 static int               a2width(const struct man_node *,
                                struct roffsu *);

-
-static int               man_alt_pre(MAN_ARGS);
-static int               man_br_pre(MAN_ARGS);
-static int               man_ign_pre(MAN_ARGS);
-static void              man_root_post(MAN_ARGS);
-static int               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_PP_pre(MAN_ARGS);

-static int               man_SB_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_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);

-
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
+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 */


@@ -80,9 +88,9 @@ 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 }, /* SM */

-       { man_SB_pre, NULL }, /* SB */
+       { man_SM_pre, NULL }, /* SB */

        { man_alt_pre, NULL }, /* BI */
        { man_alt_pre, NULL }, /* IB */
        { man_alt_pre, NULL }, /* BR */
        { man_alt_pre, NULL }, /* BI */
        { man_alt_pre, NULL }, /* IB */
        { man_alt_pre, NULL }, /* BR */


@@ -92,83 +100,104 @@ 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 */

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

        { man_br_pre, NULL }, /* sp */
        { man_br_pre, NULL }, /* sp */

-       { NULL, NULL }, /* nf */
-       { NULL, NULL }, /* fi */
-       { NULL, NULL }, /* r */
+       { man_literal_pre, NULL }, /* nf */
+       { man_literal_pre, NULL }, /* fi */

        { NULL, NULL }, /* RE */
        { NULL, NULL }, /* RE */

-       { NULL, NULL }, /* RS */
+       { man_RS_pre, NULL }, /* RS */

        { man_ign_pre, NULL }, /* DT */
        { man_ign_pre, NULL }, /* UC */
        { man_ign_pre, NULL }, /* DT */
        { man_ign_pre, NULL }, /* UC */

+       { man_ign_pre, NULL }, /* PD */
+       { 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 man_node *n)

 {
 {

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

 
 

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

 
 

-       print_gen_doctype(h);
-
-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_man(man_meta(m), man_node(m), h);
-       print_tagq(h, t);
+       if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)
+               if (NULL == n->prev)
+                       return;

 
 

-       printf("\n");
+       print_paragraph(h);

 }
 
 }
 

+void
+html_man(void *arg, const struct man *man)
+{
+       struct mhtml     mh;
+
+       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;
 
        struct htmlpair  tag;
 

-       t = print_otag(h, TAG_HEAD, 0, NULL);
-
-       print_man_head(m, n, h);
-       print_tagq(h, t);
-       t = print_otag(h, TAG_BODY, 0, NULL);
-
-       tag.key = ATTR_CLASS;
-       tag.val = "body";
-       print_otag(h, TAG_DIV, 1, &tag);
+       PAIR_CLASS_INIT(&tag, "mandoc");

 
 

-       print_man_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_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);
-       buffmt(h, "%s(%d)", 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, h);
+       print_man_node(man, n, mh, h);

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

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

 }
 
 }
 

-

 static void
 print_man_node(MAN_ARGS)
 {
 static void
 print_man_node(MAN_ARGS)
 {


@@ -176,145 +205,152 @@ print_man_node(MAN_ARGS)
        struct tag      *t;
 
        child = 1;
        struct tag      *t;
 
        child = 1;

-       t = SLIST_FIRST(&h->tags);
-
-       bufinit(h);
+       t = h->tags.head;

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

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

                break;
                break;

-       case (MAN_TEXT):
+       case MAN_TEXT:
+               if ('\0' == *n->string) {
+                       print_paragraph(h);
+                       return;
+               }
+               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_text(h, n->string);
                print_text(h, n->string);

+               return;
+       case MAN_EQN:
+               print_eqn(h, n->eqn);

                break;
                break;

+       case MAN_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:
        default:

+               /*
+                * Close out scope of font prior to opening a macro
+                * scope.
+                */
+               if (HTMLFONT_NONE != h->metac) {
+                       h->metal = h->metac;
+                       h->metac = HTMLFONT_NONE;
+               }
+
+               /*
+                * 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;
+               }

                if (mans[n->tok].pre)
                if (mans[n->tok].pre)

-                       child = (*mans[n->tok].pre)(m, n, 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, h);
+               print_man_nodelist(man, n->child, mh, h);

 
 

+       /* This will automatically close out any font scope. */

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

-       bufinit(h);
-

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

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

                break;
                break;

-       case (MAN_TEXT):
+       case MAN_EQN:

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

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

                break;
        }
 }
 
                break;
        }
 }
 

-

 static int
 a2width(const struct man_node *n, struct roffsu *su)
 {
 
        if (MAN_TEXT != n->type)
                return(0);
 static int
 a2width(const struct man_node *n, struct roffsu *su)
 {
 
        if (MAN_TEXT != n->type)
                return(0);

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

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

-
-/* ARGSUSED */
-static int
+static void

 man_root_pre(MAN_ARGS)
 {
 man_root_pre(MAN_ARGS)
 {

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

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

-       char             b[BUFSIZ], title[BUFSIZ];
+       char            *title;
+
+       assert(man->title);
+       assert(man->msec);
+       mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);

 
 

-       b[0] = 0;
-       if (m->vol)
-               (void)strlcat(b, m->vol, BUFSIZ);
+       PAIR_CLASS_INIT(&tag, "head");
+       t = print_otag(h, TAG_TABLE, 1, &tag);

 
 

-       (void)snprintf(title, BUFSIZ - 1, 
-                       "%s(%d)", m->title, m->msec);
+       print_otag(h, TAG_TBODY, 0, NULL);

 
 

-       PAIR_CLASS_INIT(&tag[0], "header");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       t = print_otag(h, TAG_TABLE, 2, tag);

        tt = print_otag(h, TAG_TR, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 

-       bufinit(h);
-       bufcat_style(h, "width", "10%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       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);
 

-       bufinit(h);
-       bufcat_style(h, "width", "80%");
-       bufcat_style(h, "white-space", "nowrap");
-       bufcat_style(h, "text-align", "center");
-       PAIR_STYLE_INIT(&tag[0], h);
-       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);
 

-       bufinit(h);
-       bufcat_style(h, "width", "10%");
-       bufcat_style(h, "text-align", "right");
-       PAIR_STYLE_INIT(&tag[0], h);
-       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);

-       return(1);
+       free(title);

 }
 
 }
 

-
-/* ARGSUSED */

 static void
 man_root_post(MAN_ARGS)
 {
 static void
 man_root_post(MAN_ARGS)
 {

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

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

-       char             b[BUFSIZ];
-
-       (void)localtime_r(&m->date, &tm);

 
 

-       if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-               err(EXIT_FAILURE, "strftime");
+       PAIR_CLASS_INIT(&tag, "foot");
+       t = print_otag(h, TAG_TABLE, 1, &tag);

 
 

-       PAIR_CLASS_INIT(&tag[0], "footer");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       t = print_otag(h, TAG_TABLE, 2, tag);

        tt = print_otag(h, TAG_TR, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 

-       bufinit(h);
-       bufcat_style(h, "width", "50%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
+       PAIR_CLASS_INIT(&tag, "foot-date");
+       print_otag(h, TAG_TD, 1, &tag);
+
+       assert(man->date);
+       print_text(h, man->date);

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

-       bufinit(h);
-       bufcat_style(h, "width", "50%");
-       bufcat_style(h, "text-align", "right");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
-       if (m->source)
-               print_text(h, m->source);
+       PAIR_CLASS_INIT(&tag, "foot-os");
+       print_otag(h, TAG_TD, 1, &tag);
+
+       if (man->source)
+               print_text(h, man->source);

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

-
-/* ARGSUSED */

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


@@ -324,87 +360,73 @@ 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) {

-               su.scale = 1;
-               if (n->child)
-                       a2roffsu(n->child->string, &su);
-       } else if (MAN_br == n->tok)
-               su.scale = 0;
+               if (NULL != (n = n->child))
+                       if ( ! a2roffsu(n->string, &su, SCALE_VS))
+                               SCALE_VS_INIT(&su, atoi(n->string));
+       } else
+               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);

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

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

-
-/* ARGSUSED */

 static int
 man_SH_pre(MAN_ARGS)
 {
 static int
 man_SH_pre(MAN_ARGS)
 {

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

 
 

-       if (MAN_BODY == n->type) {
-               SCALE_HS_INIT(&su, INDENT);
-               bufcat_su(h, "margin-left", &su);
-               PAIR_CLASS_INIT(&tag[0], "sec-body");
-               PAIR_STYLE_INIT(&tag[1], h);
-               print_otag(h, TAG_DIV, 2, tag);
+       if (MAN_BLOCK == n->type) {
+               mh->fl &= ~MANH_LITERAL;
+               PAIR_CLASS_INIT(&tag, "section");
+               print_otag(h, TAG_DIV, 1, &tag);

                return(1);
                return(1);

-       } else if (MAN_BLOCK == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "sec-block");
-               if (n->prev && MAN_SH == n->prev->tok)
-                       if (NULL == n->prev->body->child) {
-                               print_otag(h, TAG_DIV, 1, tag);
-                               return(1);
-                       }
-
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               if (NULL == n->next)
-                       bufcat_su(h, "margin-bottom", &su);
-               PAIR_STYLE_INIT(&tag[1], h);
-               print_otag(h, TAG_DIV, 2, tag);
+       } else if (MAN_BODY == n->type)

                return(1);
                return(1);

-       }

 
 

-       PAIR_CLASS_INIT(&tag[0], "sec-head");
-       print_otag(h, TAG_DIV, 1, tag);
+       print_otag(h, TAG_H1, 0, NULL);

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

-
-/* ARGSUSED */

 static int
 man_alt_pre(MAN_ARGS)
 {
        const struct man_node   *nn;
 static int
 man_alt_pre(MAN_ARGS)
 {
        const struct man_node   *nn;

-       struct tag              *t;
-       int                      i;
-       struct htmlpair          tagi, tagb, *tagp;
+       int              i, savelit;
+       enum htmltag     fp;
+       struct tag      *t;

 
 

-       PAIR_CLASS_INIT(&tagi, "italic");
-       PAIR_CLASS_INIT(&tagb, "bold");
+       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++) {
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {

+               t = NULL;

                switch (n->tok) {
                switch (n->tok) {

-               case (MAN_BI):
-                       tagp = i % 2 ? &tagi : &tagb;
+               case MAN_BI:
+                       fp = i % 2 ? TAG_I : TAG_B;

                        break;
                        break;

-               case (MAN_IB):
-                       tagp = i % 2 ? &tagb : &tagi;
+               case MAN_IB:
+                       fp = i % 2 ? TAG_B : TAG_I;

                        break;
                        break;

-               case (MAN_RI):
-                       tagp = i % 2 ? &tagi : NULL;
+               case MAN_RI:
+                       fp = i % 2 ? TAG_I : TAG_MAX;

                        break;
                        break;

-               case (MAN_IR):
-                       tagp = i % 2 ? NULL : &tagi;
+               case MAN_IR:
+                       fp = i % 2 ? TAG_MAX : TAG_I;

                        break;
                        break;

-               case (MAN_BR):
-                       tagp = i % 2 ? NULL : &tagb;
+               case MAN_BR:
+                       fp = i % 2 ? TAG_MAX : TAG_B;

                        break;
                        break;

-               case (MAN_RB):
-                       tagp = i % 2 ? &tagb : NULL;
+               case MAN_RB:
+                       fp = i % 2 ? TAG_B : TAG_MAX;

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


@@ -414,257 +436,240 @@ man_alt_pre(MAN_ARGS)
                if (i)
                        h->flags |= HTML_NOSPACE;
 
                if (i)
                        h->flags |= HTML_NOSPACE;
 

-               if (tagp) {
-                       t = print_otag(h, TAG_SPAN, 1, tagp);
-                       print_man_node(m, nn, h);
+               if (TAG_MAX != fp)
+                       t = print_otag(h, fp, 0, NULL);
+
+               print_man_node(man, nn, mh, h);
+
+               if (t)

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

-               } else
-                       print_man_node(m, nn, h);

        }
 
        }
 

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

 
 

-
-/* ARGSUSED */
-static int
-man_SB_pre(MAN_ARGS)
-{
-       struct htmlpair  tag;
-       
-       PAIR_CLASS_INIT(&tag, "small bold");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       return(0);

 }
 
 }
 

-
-/* ARGSUSED */

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

-       struct htmlpair  tag;
-       
-       PAIR_CLASS_INIT(&tag, "small");
-       print_otag(h, TAG_SPAN, 1, &tag);
+
+       print_otag(h, TAG_SMALL, 0, NULL);
+       if (MAN_SB == n->tok)
+               print_otag(h, TAG_B, 0, NULL);

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

-
-/* ARGSUSED */

 static int
 man_SS_pre(MAN_ARGS)
 {
 static int
 man_SS_pre(MAN_ARGS)
 {

-       struct htmlpair  tag[3];
-       struct roffsu    su;
-
-       SCALE_VS_INIT(&su, 1);
-
-       if (MAN_BODY == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "ssec-body");
-               if (n->parent->next && n->child) {
-                       bufcat_su(h, "margin-bottom", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_DIV, 2, tag);
-                       return(1);
-               }
+       struct htmlpair  tag;

 
 

-               print_otag(h, TAG_DIV, 1, tag);
+       if (MAN_BLOCK == n->type) {
+               mh->fl &= ~MANH_LITERAL;
+               PAIR_CLASS_INIT(&tag, "subsection");
+               print_otag(h, TAG_DIV, 1, &tag);

                return(1);
                return(1);

-       } else if (MAN_BLOCK == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "ssec-block");
-               if (n->prev && MAN_SS == n->prev->tok) 
-                       if (n->prev->body->child) {
-                               bufcat_su(h, "margin-top", &su);
-                               PAIR_STYLE_INIT(&tag[1], h);
-                               print_otag(h, TAG_DIV, 2, tag);
-                               return(1);
-                       }
-
-               print_otag(h, TAG_DIV, 1, tag);
+       } else if (MAN_BODY == n->type)

                return(1);
                return(1);

-       }

 
 

-       SCALE_HS_INIT(&su, INDENT - HALFINDENT);
-       bufcat_su(h, "margin-left", &su);
-       PAIR_CLASS_INIT(&tag[0], "ssec-head");
-       PAIR_STYLE_INIT(&tag[1], h);
-       print_otag(h, TAG_DIV, 2, tag);
+       print_otag(h, TAG_H2, 0, NULL);

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

-
-/* ARGSUSED */

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

-       struct htmlpair  tag;
-       struct roffsu    su;
-       int              i;
-
-       if (MAN_BLOCK != n->type)
-               return(1);
-
-       i = 0;

 
 

-       if (MAN_ROOT == n->parent->tok) {
-               SCALE_HS_INIT(&su, INDENT);
-               bufcat_su(h, "margin-left", &su);
-               i++;
-       }
-       if (n->next && n->next->child) {
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-bottom", &su);
-               i++;
-       }
+       if (MAN_HEAD == n->type)
+               return(0);
+       else if (MAN_BLOCK == n->type)
+               print_bvspace(h, n);

 
 

-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, i ? 1 : 0, &tag);

        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;
        const struct man_node   *nn;

-       int                      width;

 
 

-       /*
-        * 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) { 
-               SCALE_HS_INIT(&su, INDENT);
-               bufcat_su(h, "margin-left", &su);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
+       if (MAN_BODY == n->type) {
+               print_otag(h, TAG_DD, 0, NULL);

                return(1);
                return(1);

-       }
-
-       nn = MAN_BLOCK == n->type ? 
-               n->head->child : n->parent->head->child;
-
-       SCALE_HS_INIT(&su, INDENT);
-       width = 0;
-
-       if (MAN_IP == n->tok && NULL != nn)
-               if (NULL != (nn = nn->next)) {
-                       for ( ; nn->next; nn = nn->next)
-                               /* Do nothing. */ ;
-                       width = a2width(nn, &su);
-               }
-
-       if (MAN_TP == n->tok && NULL != nn)
-               width = a2width(nn, &su);
-
-       if (MAN_BLOCK == n->type) {
-               bufcat_su(h, "margin-left", &su);
-               bufcat_style(h, "clear", "both");
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
+       } else if (MAN_HEAD != n->type) {
+               print_otag(h, TAG_DL, 0, NULL);

                return(1);
                return(1);

-       } 
+       }

 
 

-       bufcat_su(h, "min-width", &su);
-       SCALE_INVERT(&su);
-       bufcat_su(h, "margin-left", &su);
-       SCALE_HS_INIT(&su, 1);
-       bufcat_su(h, "margin-right", &su);
-       bufcat_style(h, "clear", "left");
+       /* FIXME: width specification. */

 
 

-       if (n->next && n->next->child)
-               bufcat_style(h, "float", "left");
+       print_otag(h, TAG_DT, 0, NULL);

 
 

-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, 1, &tag);
+       /* For IP, only print the first header element. */

 
 

-       /* With a length string, manually omit the last child. */
+       if (MAN_IP == n->tok && n->child)
+               print_man_node(man, n->child, mh, h);

 
 

-       if ( ! width)
-               return(1);
+       /* For TP, only print next-line header elements. */

 
 

-       if (MAN_IP == n->tok)
-               for (nn = n->child; nn->next; nn = nn->next)
-                       print_man_node(m, nn, h);
-       if (MAN_TP == n->tok)
-               for (nn = n->child->next; nn; nn = nn->next)
-                       print_man_node(m, nn, 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)
 {

-       const struct man_node   *nn;
-       struct htmlpair          tag;
-       struct roffsu            su;
+       struct htmlpair  tag[2];
+       struct roffsu    su;
+       const struct man_node *np;

 
        if (MAN_HEAD == n->type)
                return(0);
 
        if (MAN_HEAD == n->type)
                return(0);

+       else if (MAN_BLOCK != n->type)
+               return(1);

 
 

-       nn = MAN_BLOCK == n->type ?
-               n->head->child : n->parent->head->child;
-
-       SCALE_HS_INIT(&su, INDENT);
+       np = n->head->child;

 
 

-       if (NULL != nn)
-               (void)a2width(nn, &su);
+       if (NULL == np || ! a2width(np, &su))
+               SCALE_HS_INIT(&su, INDENT);

 
 

-       if (MAN_BLOCK == n->type) {
-               bufcat_su(h, "margin-left", &su);
-               bufcat_style(h, "clear", "both");
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-               return(1);
-       }
+       bufinit(h);

 
 

+       print_bvspace(h, n);

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

-       SCALE_INVERT(&su);
+       su.scale = -su.scale;

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

-
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, 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)
 {

-       struct htmlpair  tag;

 
 

-       PAIR_CLASS_INIT(&tag, "bold");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 0, NULL);

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

-
-/* ARGSUSED */

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

-       struct htmlpair  tag;

 
 

-       PAIR_CLASS_INIT(&tag, "italic");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 0, NULL);

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

+static int
+man_literal_pre(MAN_ARGS)
+{
+
+       if (MAN_fi == n->tok || MAN_EE == n->tok) {
+               print_otag(h, TAG_BR, 0, NULL);
+               mh->fl &= ~MANH_LITERAL;
+       } else
+               mh->fl |= MANH_LITERAL;
+
+       return(0);
+}
+
+static int
+man_in_pre(MAN_ARGS)
+{
+
+       print_otag(h, TAG_BR, 0, NULL);
+       return(0);
+}

 
 

-/* ARGSUSED */

 static int
 man_ign_pre(MAN_ARGS)
 {
 
        return(0);
 }
 static int
 man_ign_pre(MAN_ARGS)
 {
 
        return(0);
 }

+
+static int
+man_RS_pre(MAN_ARGS)
+{
+       struct htmlpair  tag;
+       struct roffsu    su;
+
+       if (MAN_HEAD == n->type)
+               return(0);
+       else if (MAN_BODY == n->type)
+               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);
+}
+
+static int
+man_UR_pre(MAN_ARGS)
+{
+       struct htmlpair          tag[2];
+
+       n = n->child;
+       assert(MAN_HEAD == n->type);
+       if (n->nchild) {
+               assert(MAN_TEXT == n->child->type);
+               PAIR_CLASS_INIT(&tag[0], "link-ext");
+               PAIR_HREF_INIT(&tag[1], n->child->string);
+               print_otag(h, TAG_A, 2, tag);
+       }
+
+       assert(MAN_BODY == n->next->type);
+       if (n->next->nchild)
+               n = n->next;
+
+       print_man_nodelist(man, n->child, mh, h);
+
+       return(0);
+}