Cleanups in -T[x]html: make html_idcat() use the buffer and be called

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index ce40c3fba26ab1b3f4a9d7a090f40b603b95123f..73953ecdd21868e221d59e283674f27c5de6b788 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,6 +1,6 @@
-/*     $Id: man_html.c,v 1.4 2009/10/04 09:35:26 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.72 2011/05/17 11:34:31 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * 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,24 +14,40 @@
  * 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.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

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

-#include <sys/queue.h>

 
 

-#include <err.h>
+#include <assert.h>
+#include <ctype.h>

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

+#include "mandoc.h"
+#include "out.h"

 #include "html.h"
 #include "man.h"
 #include "html.h"
 #include "man.h"

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

 
 

-#define        INDENT            7
+#define        INDENT            5

 #define        HALFINDENT        3
 
 #define        MAN_ARGS          const struct man_meta *m, \
                          const struct man_node *n, \
 #define        HALFINDENT        3
 
 #define        MAN_ARGS          const struct man_meta *m, \
                          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);


@@ -42,50 +58,60 @@ 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_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
 

+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_br_pre(MAN_ARGS);

-static int               man_PP_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_post(MAN_ARGS);

-static int               man_root_pre(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_I_pre(MAN_ARGS);
+static int               man_IP_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_SH_pre(MAN_ARGS);

+static int               man_SM_pre(MAN_ARGS);

 static int               man_SS_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 const struct htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { man_SS_pre, NULL }, /* SS */
 static const struct htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { man_SS_pre, NULL }, /* SS */

-       { NULL, NULL }, /* TP */
+       { man_IP_pre, NULL }, /* TP */

        { man_PP_pre, NULL }, /* LP */
        { man_PP_pre, NULL }, /* PP */
        { man_PP_pre, NULL }, /* P */
        { man_PP_pre, NULL }, /* LP */
        { man_PP_pre, NULL }, /* PP */
        { man_PP_pre, NULL }, /* P */

-       { NULL, NULL }, /* IP */
-       { NULL, NULL }, /* HP */ 
-       { NULL, NULL }, /* SM */
-       { NULL, NULL }, /* SB */
-       { NULL, NULL }, /* BI */
-       { NULL, NULL }, /* IB */
-       { NULL, NULL }, /* BR */
-       { NULL, NULL }, /* RB */
+       { man_IP_pre, NULL }, /* IP */
+       { man_HP_pre, NULL }, /* HP */ 
+       { man_SM_pre, NULL }, /* SM */
+       { man_SM_pre, NULL }, /* SB */
+       { man_alt_pre, NULL }, /* BI */
+       { man_alt_pre, NULL }, /* IB */
+       { man_alt_pre, NULL }, /* BR */
+       { man_alt_pre, NULL }, /* RB */

        { NULL, NULL }, /* R */
        { NULL, NULL }, /* R */

-       { NULL, NULL }, /* B */
-       { NULL, NULL }, /* I */
-       { NULL, NULL }, /* IR */
-       { NULL, NULL }, /* RI */
-       { NULL, NULL }, /* na */
-       { NULL, NULL }, /* i */
+       { man_B_pre, NULL }, /* B */
+       { 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_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 */
-       { NULL, NULL }, /* DT */
-       { NULL, NULL }, /* UC */
+       { man_RS_pre, NULL }, /* RS */
+       { 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 */

 };
 
 
 };
 
 


@@ -94,13 +120,16 @@ html_man(void *arg, const struct man *m)
 {
        struct html     *h;
        struct tag      *t;
 {
        struct html     *h;
        struct tag      *t;

+       struct mhtml     mh;

 
        h = (struct html *)arg;
 
 
        h = (struct html *)arg;
 

-       print_gen_doctype(h);
+       print_gen_decls(h);
+
+       memset(&mh, 0, sizeof(struct mhtml));

 
        t = print_otag(h, TAG_HTML, 0, NULL);
 
        t = print_otag(h, TAG_HTML, 0, NULL);

-       print_man(man_meta(m), man_node(m), h);
+       print_man(man_meta(m), man_node(m), &mh, h);

        print_tagq(h, t);
 
        printf("\n");
        print_tagq(h, t);
 
        printf("\n");


@@ -111,20 +140,13 @@ static void
 print_man(MAN_ARGS) 
 {
        struct tag      *t;
 print_man(MAN_ARGS) 
 {
        struct tag      *t;

-       struct htmlpair  tag;

 
        t = print_otag(h, TAG_HEAD, 0, NULL);
 
        t = print_otag(h, TAG_HEAD, 0, NULL);

-
-       print_man_head(m, n, h);
+       print_man_head(m, n, mh, h);

        print_tagq(h, t);
        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);
-
-       print_man_nodelist(m, n, h);

 
 

+       t = print_otag(h, TAG_BODY, 0, NULL);
+       print_man_nodelist(m, n, mh, h);

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


@@ -135,9 +157,7 @@ print_man_head(MAN_ARGS)
 {
 
        print_gen_head(h);
 {
 
        print_gen_head(h);

-       bufinit(h);
-       buffmt(h, "%s(%d)", m->title, m->msec);
-
+       bufcat_fmt(h, "%s(%s)", m->title, m->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);
 }


@@ -147,9 +167,9 @@ static void
 print_man_nodelist(MAN_ARGS)
 {
 
 print_man_nodelist(MAN_ARGS)
 {
 

-       print_man_node(m, n, h);
+       print_man_node(m, n, mh, h);

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

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

 }
 
 
 }
 
 


@@ -158,51 +178,116 @@ print_man_node(MAN_ARGS)
 {
        int              child;
        struct tag      *t;
 {
        int              child;
        struct tag      *t;

+       struct htmlpair  tag;

 
        child = 1;
 
        child = 1;

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

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

-               child = man_root_pre(m, n, h);
+               man_root_pre(m, n, mh, h);

                break;
        case (MAN_TEXT):
                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.
+                */
+               if ('\0' == *n->string) {
+                       print_otag(h, TAG_P, 0, NULL);
+                       return;
+               } else if (' ' == *n->string && MAN_LINE & n->flags)
+                       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;
+       case (MAN_EQN):
+               PAIR_CLASS_INIT(&tag, "eqn");
+               print_otag(h, TAG_SPAN, 1, &tag);
+               print_text(h, n->eqn->data);

                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)(m, n, mh, h);

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

-               print_man_nodelist(m, n->child, h);
+               print_man_nodelist(m, 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) {
        case (MAN_ROOT):
        switch (n->type) {
        case (MAN_ROOT):

-               man_root_post(m, n, h);
+               man_root_post(m, 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)(m, n, mh, h);

                break;
        }
 }
 
 
                break;
        }
 }
 
 

-/* ARGSUSED */

 static int
 static int

+a2width(const struct man_node *n, struct roffsu *su)
+{
+
+       if (MAN_TEXT != n->type)
+               return(0);
+       if (a2roffsu(n->string, su, SCALE_BU))
+               return(1);
+
+       return(0);
+}
+
+
+/* ARGSUSED */
+static void

 man_root_pre(MAN_ARGS)
 {
 man_root_pre(MAN_ARGS)
 {

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

        struct tag      *t, *tt;
        char             b[BUFSIZ], title[BUFSIZ];
 
        struct tag      *t, *tt;
        char             b[BUFSIZ], title[BUFSIZ];
 


@@ -210,35 +295,49 @@ man_root_pre(MAN_ARGS)
        if (m->vol)
                (void)strlcat(b, m->vol, BUFSIZ);
 
        if (m->vol)
                (void)strlcat(b, m->vol, BUFSIZ);
 

-       (void)snprintf(title, BUFSIZ - 1, 
-                       "%s(%d)", m->title, m->msec);
+       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);
+
+       print_otag(h, TAG_TBODY, 0, NULL);

 
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "header";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       t = print_otag(h, TAG_TABLE, 2, tag);

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

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 10%;";
+       PAIR_CLASS_INIT(&tag[0], "head-ltitle");

        print_otag(h, TAG_TD, 1, tag);
        print_otag(h, TAG_TD, 1, tag);

+

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

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 80%; white-space: nowrap; text-align: center;";
-       print_otag(h, TAG_TD, 1, tag);
+       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);
        print_stagq(h, tt);
 
        print_text(h, b);
        print_stagq(h, tt);
 

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 10%; text-align: right;";
-       print_otag(h, TAG_TD, 1, tag);
+       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);
+

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

-
-       return(1);

 }
 
 
 }
 
 


@@ -246,32 +345,35 @@ man_root_pre(MAN_ARGS)
 static void
 man_root_post(MAN_ARGS)
 {
 static void
 man_root_post(MAN_ARGS)
 {

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

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

 
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "footer";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       t = print_otag(h, TAG_TABLE, 2, tag);

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

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%;";
+       PAIR_CLASS_INIT(&tag[0], "foot-date");

        print_otag(h, TAG_TD, 1, tag);
        print_otag(h, TAG_TD, 1, tag);

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

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

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%; text-align: right;";
-       print_otag(h, TAG_TD, 1, tag);
+       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);
+

        if (m->source)
                print_text(h, m->source);
        print_tagq(h, t);
        if (m->source)
                print_text(h, m->source);
        print_tagq(h, t);


@@ -283,26 +385,26 @@ man_root_post(MAN_ARGS)
 static int
 man_br_pre(MAN_ARGS)
 {
 static int
 man_br_pre(MAN_ARGS)
 {

-       int             len;
-       struct htmlpair tag;
+       struct roffsu    su;
+       struct htmlpair  tag;

 
 

-       switch (n->tok) {
-       case (MAN_sp):
-               len = n->child ? atoi(n->child->string) : 1;
-               break;
-       case (MAN_br):
-               len = 0;
-               break;
-       default:
-               len = 1;
-               break;
-       }
+       SCALE_VS_INIT(&su, 1);
+
+       if (MAN_sp == n->tok) {
+               if (n->child)
+                       a2roffsu(n->child->string, &su, SCALE_VS);
+       } else
+               su.scale = 0;

 
 

-       buffmt(h, "height: %dem;", len);
-       tag.key = ATTR_STYLE;
-       tag.val = h->buf;
+       bufinit(h);
+       bufcat_su(h, "height", &su);
+       PAIR_STYLE_INIT(&tag, h);

        print_otag(h, TAG_DIV, 1, &tag);
        print_otag(h, TAG_DIV, 1, &tag);

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

 }
 
 
 }
 
 


@@ -310,43 +412,79 @@ man_br_pre(MAN_ARGS)
 static int
 man_SH_pre(MAN_ARGS)
 {
 static int
 man_SH_pre(MAN_ARGS)
 {

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

 
 

-       if (MAN_BODY == n->type) {
-               buffmt(h, "margin-left: %dem;", INDENT);
+       if (MAN_BLOCK == n->type) {
+               PAIR_CLASS_INIT(&tag, "section");
+               print_otag(h, TAG_DIV, 1, &tag);
+               return(1);
+       } else if (MAN_BODY == n->type)
+               return(1);

 
 

-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "sec-body";
-               tag[1].key = ATTR_STYLE;
-               tag[1].val = h->buf;
+       print_otag(h, TAG_H1, 0, NULL);
+       return(1);
+}

 
 

-               print_otag(h, TAG_DIV, 2, tag);
-               return(1);
-       } else if (MAN_BLOCK == n->type) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "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);
-                       }
+/* ARGSUSED */
+static int
+man_alt_pre(MAN_ARGS)
+{
+       const struct man_node   *nn;
+       int              i;
+       enum htmltag     fp;
+       struct tag      *t;
+
+       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
+               t = NULL;
+               switch (n->tok) {
+               case (MAN_BI):
+                       fp = i % 2 ? TAG_I : TAG_B;
+                       break;
+               case (MAN_IB):
+                       fp = i % 2 ? TAG_B : TAG_I;
+                       break;
+               case (MAN_RI):
+                       fp = i % 2 ? TAG_I : TAG_MAX;
+                       break;
+               case (MAN_IR):
+                       fp = i % 2 ? TAG_MAX : TAG_I;
+                       break;
+               case (MAN_BR):
+                       fp = i % 2 ? TAG_MAX : TAG_B;
+                       break;
+               case (MAN_RB):
+                       fp = i % 2 ? TAG_B : TAG_MAX;
+                       break;
+               default:
+                       abort();
+                       /* NOTREACHED */
+               }

 
 

-               bufcat(h, "margin-top: 1em;");
-               if (NULL == n->next)
-                       bufcat(h, "margin-bottom: 1em;");
+               if (i)
+                       h->flags |= HTML_NOSPACE;

 
 

-               tag[1].key = ATTR_STYLE;
-               tag[1].val = h->buf;
+               if (TAG_MAX != fp)
+                       t = print_otag(h, fp, 0, NULL);

 
 

-               print_otag(h, TAG_DIV, 2, tag);
-               return(1);
+               print_man_node(m, nn, mh, h);
+
+               if (t)
+                       print_tagq(h, t);

        }
 
        }
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "sec-head";
+       return(0);
+}
+

 
 

-       print_otag(h, TAG_DIV, 1, tag);
+/* ARGSUSED */
+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);
 }
 
        return(1);
 }
 


@@ -355,65 +493,219 @@ man_SH_pre(MAN_ARGS)
 static int
 man_SS_pre(MAN_ARGS)
 {
 static int
 man_SS_pre(MAN_ARGS)
 {

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

 
 

-       i = 0;
+       if (MAN_BLOCK == n->type) {
+               PAIR_CLASS_INIT(&tag, "subsection");
+               print_otag(h, TAG_DIV, 1, &tag);
+               return(1);
+       } else if (MAN_BODY == n->type)
+               return(1);

 
 

-       if (MAN_BODY == n->type) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-body";
+       print_otag(h, TAG_H2, 0, NULL);
+       return(1);
+}

 
 

-               if (n->parent->next && n->child) {
-                       bufcat(h, "margin-bottom: 1em;");
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = h->buf;
-               }

 
 

-               print_otag(h, TAG_DIV, i, tag);
+/* ARGSUSED */
+static int
+man_PP_pre(MAN_ARGS)
+{
+
+       if (MAN_HEAD == n->type)
+               return(0);
+       else if (MAN_BODY == n->type && n->prev)
+               print_otag(h, TAG_P, 0, NULL);
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+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);
+
+       /* 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 (MAN_BLOCK == n->type) {
+               print_otag(h, TAG_P, 0, NULL);
+               print_otag(h, TAG_TABLE, 0, NULL);
+               bufinit(h);
+               bufcat_su(h, "width", &su);
+               PAIR_STYLE_INIT(&tag, h);
+               print_otag(h, TAG_COL, 1, &tag);
+               print_otag(h, TAG_COL, 0, NULL);
+               print_otag(h, TAG_TBODY, 0, NULL);
+               print_otag(h, TAG_TR, 0, NULL);

                return(1);
                return(1);

-       } else if (MAN_BLOCK == n->type) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-block";
+       } 
+
+       print_otag(h, TAG_TD, 0, NULL);
+
+       /* For IP, only print the first header element. */
+
+       if (MAN_IP == n->tok && n->child)
+               print_man_node(m, n->child, mh, h);
+
+       /* 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);
+
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+man_HP_pre(MAN_ARGS)
+{
+       struct htmlpair  tag;
+       struct roffsu    su;
+       const struct man_node *np;
+
+       bufinit(h);
+
+       np = MAN_BLOCK == n->type ? 
+               n->head->child : 
+               n->parent->head->child;

 
 

-               if (n->prev && MAN_SS == n->prev->tok) 
-                       if (n->prev->body->child) {
-                               bufcat(h, "margin-top: 1em;");
-                               tag[i].key = ATTR_STYLE;
-                               tag[i++].val = h->buf;
-                       }
+       if (NULL == np || ! a2width(np, &su))
+               SCALE_HS_INIT(&su, INDENT);

 
 

-               print_otag(h, TAG_DIV, i, tag);
+       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);
        }
 
                return(1);
        }
 

-       buffmt(h, "margin-left: -%dem;", INDENT - HALFINDENT);
+       su.scale = -su.scale;
+       bufcat_su(h, "text-indent", &su);
+       PAIR_STYLE_INIT(&tag, h);
+       print_otag(h, TAG_TD, 1, &tag);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+man_B_pre(MAN_ARGS)
+{
+
+       print_otag(h, TAG_B, 0, NULL);
+       return(1);
+}

 
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "ssec-head";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = h->buf;

 
 

-       print_otag(h, TAG_DIV, 2, tag);
+/* ARGSUSED */
+static int
+man_I_pre(MAN_ARGS)
+{
+       
+       print_otag(h, TAG_I, 0, NULL);

        return(1);
 }
 
 
 /* ARGSUSED */
 static int
        return(1);
 }
 
 
 /* ARGSUSED */
 static int

-man_PP_pre(MAN_ARGS)
+man_literal_pre(MAN_ARGS)
+{
+
+       if (MAN_nf == n->tok) {
+               print_otag(h, TAG_BR, 0, NULL);
+               mh->fl |= MANH_LITERAL;
+       } else
+               mh->fl &= ~MANH_LITERAL;
+
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+man_in_pre(MAN_ARGS)
+{
+
+       print_otag(h, TAG_BR, 0, NULL);
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+man_ign_pre(MAN_ARGS)

 {
 {

-       struct htmlpair tag;

 
 

-       if (MAN_BLOCK != n->type)
+       return(0);
+}
+
+
+/* ARGSUSED */
+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);
 
                return(1);
 

-       buffmt(h, "margin-left: %dem;", INDENT);
-       if (n->next && n->next->child) 
-               bufcat(h, "margin-bottom: 1em;");
+       SCALE_HS_INIT(&su, INDENT);
+       if (n->head->child)
+               a2width(n->head->child, &su);

 
 

-       tag.key = ATTR_STYLE;
-       tag.val = h->buf;
+       bufinit(h);
+       bufcat_su(h, "margin-left", &su);
+       PAIR_STYLE_INIT(&tag, h);

        print_otag(h, TAG_DIV, 1, &tag);
        return(1);
 }
        print_otag(h, TAG_DIV, 1, &tag);
        return(1);
 }