]> git.cameronkatri.com Git - mandoc.git/blobdiff - man_html.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Style message about legacy man(7) date format in mdoc(7) documents
[mandoc.git] / man_html.c
diff --git a/man_html.c b/man_html.c
index 3a6be4a98f26f8ecd7cd3d1d187b9b8daaa2ddf7..278f31a28f7cb7d8ba18669b9be5dc1873e8eb8c 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,22 +1,21 @@
-/*     $Id: man_html.c,v 1.33 2010/05/15 22:44:04 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.143 2017/06/08 12:54:58 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, 2015, 2017 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,19 +25,19 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.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"
 
 #include "main.h"
 
-/* TODO: preserve ident widths. */
 /* FIXME: have PD set the default vspace width. */
 
 #define        INDENT            5
 /* 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 html *h
 
 struct htmlman {
                          struct html *h
 
 struct htmlman {
@@ -46,32 +45,32 @@ struct      htmlman {
        int             (*post)(MAN_ARGS);
 };
 
        int             (*post)(MAN_ARGS);
 };
 
-static void              print_man(MAN_ARGS);
+static void              print_bvspace(struct html *,
+                               const struct roff_node *);
 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_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               fillmode(struct html *, int);
+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 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_RS_pre(MAN_ARGS);
 static int               man_PP_pre(MAN_ARGS);
 static int               man_RS_pre(MAN_ARGS);
-static int               man_SB_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);
+static int               man_UR_pre(MAN_ARGS);
+static int               man_alt_pre(MAN_ARGS);
+static int               man_ign_pre(MAN_ARGS);
+static int               man_in_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_TH] = {
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { man_SS_pre, NULL }, /* SS */
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { man_SS_pre, NULL }, /* SS */
@@ -80,9 +79,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,655 +91,570 @@ 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_br_pre, NULL }, /* sp */
        { NULL, NULL }, /* nf */
        { NULL, NULL }, /* fi */
        { NULL, NULL }, /* nf */
        { NULL, NULL }, /* fi */
-       { NULL, NULL }, /* r */
        { NULL, NULL }, /* RE */
        { man_RS_pre, NULL }, /* RS */
        { man_ign_pre, NULL }, /* DT */
        { man_ign_pre, NULL }, /* UC */
        { man_ign_pre, NULL }, /* PD */
        { NULL, NULL }, /* RE */
        { man_RS_pre, NULL }, /* RS */
        { man_ign_pre, NULL }, /* DT */
        { man_ign_pre, NULL }, /* UC */
        { man_ign_pre, NULL }, /* PD */
-       { man_br_pre, NULL }, /* Sp */
-       { man_ign_pre, NULL }, /* Vb */
-       { NULL, NULL }, /* Ve */
+       { man_ign_pre, NULL }, /* AT */
+       { man_in_pre, NULL }, /* in */
+       { man_OP_pre, NULL }, /* OP */
+       { NULL, NULL }, /* EX */
+       { NULL, NULL }, /* EE */
+       { man_UR_pre, NULL }, /* UR */
+       { NULL, NULL }, /* UE */
 };
 };
+static const struct htmlman *const mans = __mans - MAN_TH;
 
 
 
 
-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;
 
 
-       h = (struct html *)arg;
-
-       print_gen_decls(h);
+       if (n->body && n->body->child)
+               if (n->body->child->type == ROFFT_TBL)
+                       return;
 
 
-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_man(man_meta(m), man_node(m), h);
-       print_tagq(h, t);
+       if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)
+               if (NULL == n->prev)
+                       return;
 
 
-       printf("\n");
+       print_paragraph(h);
 }
 
 }
 
-
-static void
-print_man(MAN_ARGS) 
+void
+html_man(void *arg, const struct roff_man *man)
 {
 {
+       struct html     *h;
        struct tag      *t;
        struct tag      *t;
-       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);
+       h = (struct html *)arg;
 
 
-       print_man_nodelist(m, n, h);
+       if ((h->oflags & HTML_FRAGMENT) == 0) {
+               print_gen_decls(h);
+               print_otag(h, TAG_HTML, "");
+               t = print_otag(h, TAG_HEAD, "");
+               print_man_head(&man->meta, man->first, h);
+               print_tagq(h, t);
+               print_otag(h, TAG_BODY, "");
+       }
 
 
+       man_root_pre(&man->meta, man->first, h);
+       t = print_otag(h, TAG_DIV, "c", "manual-text");
+       print_man_nodelist(&man->meta, man->first->child, h);
        print_tagq(h, t);
        print_tagq(h, t);
+       man_root_post(&man->meta, man->first, h);
+       print_tagq(h, NULL);
 }
 
 }
 
-
-/* ARGSUSED */
 static void
 print_man_head(MAN_ARGS)
 {
 static void
 print_man_head(MAN_ARGS)
 {
+       char    *cp;
 
        print_gen_head(h);
 
        print_gen_head(h);
-       bufinit(h);
-       buffmt(h, "%s(%s)", m->title, m->msec);
-
-       print_otag(h, TAG_TITLE, 0, NULL);
-       print_text(h, h->buf);
+       mandoc_asprintf(&cp, "%s(%s)", man->title, man->msec);
+       print_otag(h, TAG_TITLE, "");
+       print_text(h, cp);
+       free(cp);
 }
 
 }
 
-
 static void
 print_man_nodelist(MAN_ARGS)
 {
 
 static void
 print_man_nodelist(MAN_ARGS)
 {
 
-       print_man_node(m, n, h);
-       if (n->next)
-               print_man_nodelist(m, n->next, h);
+       while (n != NULL) {
+               print_man_node(man, n, h);
+               n = n->next;
+       }
 }
 
 }
 
-
 static void
 print_man_node(MAN_ARGS)
 {
 static void
 print_man_node(MAN_ARGS)
 {
-       int              child;
-       struct tag      *t;
-
-       child = 1;
-       t = h->tags.head;
+       static int       want_fillmode = MAN_fi;
+       static int       save_fillmode;
 
 
-       bufinit(h);
+       struct tag      *t;
+       int              child;
 
        /*
 
        /*
-        * FIXME: embedded elements within next-line scopes (e.g., `br'
-        * within an empty `B') will cause formatting to be forgotten
-        * due to scope closing out.
+        * Handle fill mode switch requests up front,
+        * they would just cause trouble in the subsequent code.
         */
 
         */
 
+       switch (n->tok) {
+       case MAN_nf:
+       case MAN_EX:
+               want_fillmode = MAN_nf;
+               return;
+       case MAN_fi:
+       case MAN_EE:
+               want_fillmode = MAN_fi;
+               if (fillmode(h, 0) == MAN_fi)
+                       print_otag(h, TAG_BR, "");
+               return;
+       default:
+               break;
+       }
+
+       /* Set up fill mode for the upcoming node. */
+
        switch (n->type) {
        switch (n->type) {
-       case (MAN_ROOT):
-               child = man_root_pre(m, n, h);
+       case ROFFT_BLOCK:
+               save_fillmode = 0;
+               /* Some block macros suspend or cancel .nf. */
+               switch (n->tok) {
+               case MAN_TP:  /* Tagged paragraphs              */
+               case MAN_IP:  /* temporarily disable .nf        */
+               case MAN_HP:  /* for the head.                  */
+                       save_fillmode = want_fillmode;
+                       /* FALLTHROUGH */
+               case MAN_SH:  /* Section headers                */
+               case MAN_SS:  /* permanently cancel .nf.        */
+                       want_fillmode = MAN_fi;
+                       /* FALLTHROUGH */
+               case MAN_PP:  /* These have no head.            */
+               case MAN_LP:  /* They will simply               */
+               case MAN_P:   /* reopen .nf in the body.        */
+               case MAN_RS:
+               case MAN_UR:
+                       fillmode(h, MAN_fi);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case ROFFT_TBL:
+               fillmode(h, MAN_fi);
+               break;
+       case ROFFT_ELEM:
+               /*
+                * Some in-line macros produce tags and/or text
+                * in the handler, so they require fill mode to be
+                * configured up front just like for text nodes.
+                * For the others, keep the traditional approach
+                * of doing the same, for now.
+                */
+               fillmode(h, want_fillmode);
+               break;
+       case ROFFT_TEXT:
+               if (fillmode(h, want_fillmode) == MAN_fi &&
+                   want_fillmode == MAN_fi &&
+                   n->flags & NODE_LINE && *n->string == ' ' &&
+                   (h->flags & HTML_NONEWLINE) == 0)
+                       print_otag(h, TAG_BR, "");
+               if (*n->string != '\0')
+                       break;
+               print_paragraph(h);
+               return;
+       default:
                break;
                break;
-       case (MAN_TEXT):
+       }
+
+       /* Produce output for this node. */
+
+       child = 1;
+       switch (n->type) {
+       case ROFFT_TEXT:
+               t = h->tag;
                print_text(h, n->string);
                print_text(h, n->string);
+               break;
+       case ROFFT_EQN:
+               t = h->tag;
+               print_eqn(h, n->eqn);
+               break;
+       case ROFFT_TBL:
+               /*
+                * This will take care of initialising all of the table
+                * state data for the first table, then tearing it down
+                * for the last one.
+                */
+               print_tbl(h, n->span);
                return;
        default:
                return;
        default:
-               /* 
+               /*
                 * Close out scope of font prior to opening a macro
                 * Close out scope of font prior to opening a macro
-                * scope.  Assert that the metafont is on the top of the
-                * stack (it's never nested).
+                * scope.
                 */
                 */
-               if (h->metaf) {
-                       assert(h->metaf == t);
-                       print_tagq(h, h->metaf);
-                       assert(NULL == h->metaf);
-                       t = h->tags.head;
+               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->tag;
+               if (n->tok < ROFF_MAX) {
+                       roff_html_pre(h, n);
+                       child = 0;
+                       break;
+               }
+
+               assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
                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, h);
+
+               /* Some block macros resume .nf in the body. */
+               if (save_fillmode && n->type == ROFFT_BODY)
+                       want_fillmode = save_fillmode;
+
                break;
        }
 
        if (child && n->child)
                break;
        }
 
        if (child && n->child)
-               print_man_nodelist(m, n->child, h);
+               print_man_nodelist(man, n->child, 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) {
-       case (MAN_ROOT):
-               man_root_post(m, n, h);
-               break;
-       case (MAN_TEXT):
-               break;
-       default:
-               if (mans[n->tok].post)
-                       (*mans[n->tok].post)(m, n, h);
-               break;
-       }
+       if (fillmode(h, 0) == MAN_nf &&
+           n->next != NULL && n->next->flags & NODE_LINE)
+               print_endline(h);
 }
 
 }
 
-
+/*
+ * MAN_nf switches to no-fill mode, MAN_fi to fill mode.
+ * Other arguments do not switch.
+ * The old mode is returned.
+ */
 static int
 static int
-a2width(const struct man_node *n, struct roffsu *su)
+fillmode(struct html *h, int want)
 {
 {
+       struct tag      *pre;
+       int              had;
 
 
-       if (MAN_TEXT != n->type)
-               return(0);
-       if (a2roffsu(n->string, su, SCALE_BU))
-               return(1);
+       for (pre = h->tag; pre != NULL; pre = pre->next)
+               if (pre->tag == TAG_PRE)
+                       break;
 
 
-       return(0);
-}
+       had = pre == NULL ? MAN_fi : MAN_nf;
 
 
+       if (want && want != had) {
+               if (want == MAN_nf)
+                       print_otag(h, TAG_PRE, "");
+               else
+                       print_tagq(h, pre);
+       }
+       return had;
+}
 
 
-/* ARGSUSED */
 static int
 static int
+a2width(const struct roff_node *n, struct roffsu *su)
+{
+       if (n->type != ROFFT_TEXT)
+               return 0;
+       return a2roffsu(n->string, su, SCALE_EN) != NULL;
+}
+
+static void
 man_root_pre(MAN_ARGS)
 {
 man_root_pre(MAN_ARGS)
 {
-       struct htmlpair  tag[3];
        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);
+       char            *title;
 
 
-       PAIR_CLASS_INIT(&tag[0], "header");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_SUMMARY_INIT(&tag[2], "header");
+       assert(man->title);
+       assert(man->msec);
+       mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);
 
 
-       t = print_otag(h, TAG_TABLE, 3, tag);
-       tt = print_otag(h, TAG_TR, 0, NULL);
+       t = print_otag(h, TAG_TABLE, "c", "head");
+       tt = print_otag(h, TAG_TR, "");
 
 
-       bufinit(h);
-       bufcat_style(h, "width", "10%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
+       print_otag(h, TAG_TD, "c", "head-ltitle");
        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);
+       print_otag(h, TAG_TD, "c", "head-vol");
+       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);
+       print_otag(h, TAG_TD, "c", "head-rtitle");
        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 htmlpair  tag[3];
        struct tag      *t, *tt;
        struct tag      *t, *tt;
-       char             b[DATESIZ];
-
-       time2a(m->date, b, DATESIZ);
-
-       PAIR_CLASS_INIT(&tag[0], "footer");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_SUMMARY_INIT(&tag[2], "footer");
 
 
-       t = print_otag(h, TAG_TABLE, 3, tag);
-       tt = print_otag(h, TAG_TR, 0, NULL);
+       t = print_otag(h, TAG_TABLE, "c", "foot");
+       tt = print_otag(h, TAG_TR, "");
 
 
-       bufinit(h);
-       bufcat_style(h, "width", "50%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
+       print_otag(h, TAG_TD, "c", "foot-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);
+       print_otag(h, TAG_TD, "c", "foot-os");
+       if (man->os)
+               print_text(h, man->os);
        print_tagq(h, t);
 }
 
        print_tagq(h, t);
 }
 
-
-
-/* ARGSUSED */
-static int
-man_br_pre(MAN_ARGS)
-{
-       struct roffsu    su;
-       struct htmlpair  tag;
-
-       SCALE_VS_INIT(&su, 1);
-
-       switch (n->tok) {
-       case (MAN_Sp):
-               SCALE_VS_INIT(&su, 0.5);
-               break;
-       case (MAN_sp):
-               if (n->child)
-                       a2roffsu(n->child->string, &su, SCALE_VS);
-               break;
-       default:
-               su.scale = 0;
-               break;
-       }
-
-       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);
-}
-
-
-/* ARGSUSED */
 static int
 man_SH_pre(MAN_ARGS)
 {
 static int
 man_SH_pre(MAN_ARGS)
 {
-       struct htmlpair  tag[2];
-       struct roffsu    su;
-
-       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);
-               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);
-               return(1);
+       char    *id;
+
+       if (n->type == ROFFT_HEAD) {
+               id = html_make_id(n);
+               print_otag(h, TAG_H1, "cTi", "Sh", id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "selflink", id);
+               free(id);
        }
        }
-
-       PAIR_CLASS_INIT(&tag[0], "sec-head");
-       print_otag(h, TAG_DIV, 1, tag);
-       return(1);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 man_alt_pre(MAN_ARGS)
 {
 static int
 man_alt_pre(MAN_ARGS)
 {
-       const struct man_node   *nn;
-       struct tag              *t;
-       int                      i;
-       enum htmlfont            fp;
+       const struct roff_node  *nn;
+       int              i;
+       enum htmltag     fp;
+       struct tag      *t;
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                switch (n->tok) {
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                switch (n->tok) {
-               case (MAN_BI):
-                       fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD;
+               case MAN_BI:
+                       fp = i % 2 ? TAG_I : TAG_B;
                        break;
                        break;
-               case (MAN_IB):
-                       fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC;
+               case MAN_IB:
+                       fp = i % 2 ? TAG_B : TAG_I;
                        break;
                        break;
-               case (MAN_RI):
-                       fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE;
+               case MAN_RI:
+                       fp = i % 2 ? TAG_I : TAG_MAX;
                        break;
                        break;
-               case (MAN_IR):
-                       fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC;
+               case MAN_IR:
+                       fp = i % 2 ? TAG_MAX : TAG_I;
                        break;
                        break;
-               case (MAN_BR):
-                       fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD;
+               case MAN_BR:
+                       fp = i % 2 ? TAG_MAX : TAG_B;
                        break;
                        break;
-               case (MAN_RB):
-                       fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE;
+               case MAN_RB:
+                       fp = i % 2 ? TAG_B : TAG_MAX;
                        break;
                default:
                        abort();
                        break;
                default:
                        abort();
-                       /* NOTREACHED */
                }
 
                if (i)
                        h->flags |= HTML_NOSPACE;
 
                }
 
                if (i)
                        h->flags |= HTML_NOSPACE;
 
-               /* 
-                * Open and close the scope with each argument, so that
-                * internal \f escapes, which are common, are also
-                * closed out with the scope.
-                */
-               t = print_ofont(h, fp);
-               print_man_node(m, nn, h);
-               print_tagq(h, t);
-       }
-
-       return(0);
-}
+               if (fp != TAG_MAX)
+                       t = print_otag(h, fp, "");
 
 
+               print_text(h, nn->string);
 
 
-/* ARGSUSED */
-static int
-man_SB_pre(MAN_ARGS)
-{
-       struct htmlpair  tag;
-       
-       /* FIXME: print_ofont(). */
-       PAIR_CLASS_INIT(&tag, "small bold");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+               if (fp != TAG_MAX)
+                       print_tagq(h, t);
+       }
+       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);
-       return(1);
+       print_otag(h, TAG_SMALL, "");
+       if (MAN_SB == n->tok)
+               print_otag(h, TAG_B, "");
+       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);
-               }
-
-               print_otag(h, TAG_DIV, 1, tag);
-               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);
-               return(1);
+       char    *id;
+
+       if (n->type == ROFFT_HEAD) {
+               id = html_make_id(n);
+               print_otag(h, TAG_H2, "cTi", "Ss", id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "selflink", id);
+               free(id);
        }
        }
-
-       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);
-       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->type) {
-               SCALE_HS_INIT(&su, INDENT);
-               bufcat_su(h, "margin-left", &su);
-               i = 1;
-       }
-       if (n->prev) {
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               i = 1;
-       }
+       if (n->type == ROFFT_HEAD)
+               return 0;
+       else if (n->type == ROFFT_BLOCK)
+               print_bvspace(h, n);
 
 
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, i, &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;
-       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);
-               return(1);
+       const struct roff_node  *nn;
+
+       if (n->type == ROFFT_BODY) {
+               print_otag(h, TAG_DD, "c", "It-tag");
+               return 1;
+       } else if (n->type != ROFFT_HEAD) {
+               print_otag(h, TAG_DL, "c", "Bl-tag");
+               return 1;
        }
 
        }
 
-       nn = MAN_BLOCK == n->type ? 
-               n->head->child : n->parent->head->child;
+       /* FIXME: width specification. */
 
 
-       SCALE_HS_INIT(&su, INDENT);
-       width = 0;
+       print_otag(h, TAG_DT, "c", "It-tag");
 
 
-       /* Width is the last token. */
+       /* For IP, only print the first header element. */
 
 
-       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_IP == n->tok && n->child)
+               print_man_node(man, n->child, h);
 
 
-       /* Width is the first token. */
+       /* For TP, only print next-line header elements. */
 
 
-       if (MAN_TP == n->tok && NULL != nn) {
-               /* Skip past non-text children. */
-               while (nn && MAN_TEXT != nn->type)
+       if (MAN_TP == n->tok) {
+               nn = n->child;
+               while (NULL != nn && 0 == (NODE_LINE & nn->flags))
+                       nn = nn->next;
+               while (NULL != nn) {
+                       print_man_node(man, nn, h);
                        nn = nn->next;
                        nn = nn->next;
-               if (nn)
-                       width = a2width(nn, &su);
+               }
        }
 
        }
 
-       if (MAN_BLOCK == n->type) {
-               bufcat_su(h, "margin-left", &su);
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               bufcat_style(h, "clear", "both");
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-               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");
-
-       if (n->next && n->next->child)
-               bufcat_style(h, "float", "left");
-
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, 1, &tag);
+       return 0;
+}
 
 
-       /*
-        * Without a length string, we can print all of our children.
-        */
+static int
+man_HP_pre(MAN_ARGS)
+{
+       struct roffsu    sum, sui;
+       const struct roff_node *np;
 
 
-       if ( ! width)
-               return(1);
+       if (n->type == ROFFT_HEAD)
+               return 0;
+       else if (n->type != ROFFT_BLOCK)
+               return 1;
 
 
-       /*
-        * When a length has been specified, we need to carefully print
-        * our child context:  IP gets all children printed but the last
-        * (the width), while TP gets all children printed but the first
-        * (the width).
-        */
+       np = n->head->child;
 
 
-       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 (np == NULL || !a2width(np, &sum))
+               SCALE_HS_INIT(&sum, INDENT);
 
 
-       return(0);
-}
+       sui.unit = sum.unit;
+       sui.scale = -sum.scale;
 
 
+       print_bvspace(h, n);
+       print_otag(h, TAG_DIV, "csului", "Pp", &sum, &sui);
+       return 1;
+}
 
 
-/* ARGSUSED */
 static int
 static int
-man_HP_pre(MAN_ARGS)
+man_OP_pre(MAN_ARGS)
 {
 {
-       const struct man_node   *nn;
-       struct htmlpair          tag;
-       struct roffsu            su;
+       struct tag      *tt;
 
 
-       if (MAN_HEAD == n->type)
-               return(0);
+       print_text(h, "[");
+       h->flags |= HTML_NOSPACE;
+       tt = print_otag(h, TAG_SPAN, "c", "Op");
 
 
-       nn = MAN_BLOCK == n->type ?
-               n->head->child : n->parent->head->child;
+       if (NULL != (n = n->child)) {
+               print_otag(h, TAG_B, "");
+               print_text(h, n->string);
+       }
 
 
-       SCALE_HS_INIT(&su, INDENT);
+       print_stagq(h, tt);
 
 
-       if (NULL != nn)
-               (void)a2width(nn, &su);
-
-       if (MAN_BLOCK == n->type) {
-               bufcat_su(h, "margin-left", &su);
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               bufcat_style(h, "clear", "both");
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-               return(1);
+       if (NULL != n && NULL != n->next) {
+               print_otag(h, TAG_I, "");
+               print_text(h, n->next->string);
        }
 
        }
 
-       bufcat_su(h, "margin-left", &su);
-       SCALE_INVERT(&su);
-       bufcat_su(h, "text-indent", &su);
-
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(1);
+       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)
 {
-
-       print_ofont(h, HTMLFONT_BOLD);
-       return(1);
+       print_otag(h, TAG_B, "");
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 man_I_pre(MAN_ARGS)
 {
 static int
 man_I_pre(MAN_ARGS)
 {
-       
-       print_ofont(h, HTMLFONT_ITALIC);
-       return(1);
+       print_otag(h, TAG_I, "");
+       return 1;
 }
 
 }
 
+static int
+man_in_pre(MAN_ARGS)
+{
+       print_otag(h, TAG_BR, "");
+       return 0;
+}
 
 
-/* ARGSUSED */
 static int
 man_ign_pre(MAN_ARGS)
 {
 
 static int
 man_ign_pre(MAN_ARGS)
 {
 
-       return(0);
+       return 0;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 man_RS_pre(MAN_ARGS)
 {
 static int
 man_RS_pre(MAN_ARGS)
 {
-       struct htmlpair  tag;
        struct roffsu    su;
 
        struct roffsu    su;
 
-       if (MAN_HEAD == n->type)
-               return(0);
-       else if (MAN_BODY == n->type)
-               return(1);
+       if (n->type == ROFFT_HEAD)
+               return 0;
+       else if (n->type == ROFFT_BODY)
+               return 1;
 
        SCALE_HS_INIT(&su, INDENT);
 
        SCALE_HS_INIT(&su, INDENT);
-       bufcat_su(h, "margin-left", &su);
-
-       if (n->head->child) {
-               SCALE_VS_INIT(&su, 1);
+       if (n->head->child)
                a2width(n->head->child, &su);
                a2width(n->head->child, &su);
-               bufcat_su(h, "margin-top", &su);
+
+       print_otag(h, TAG_DIV, "sul", &su);
+       return 1;
+}
+
+static int
+man_UR_pre(MAN_ARGS)
+{
+       n = n->child;
+       assert(n->type == ROFFT_HEAD);
+       if (n->child != NULL) {
+               assert(n->child->type == ROFFT_TEXT);
+               print_otag(h, TAG_A, "cTh", "Lk", n->child->string);
        }
 
        }
 
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(1);
+       assert(n->next->type == ROFFT_BODY);
+       if (n->next->child != NULL)
+               n = n->next;
+
+       print_man_nodelist(man, n->child, h);
+
+       return 0;
 }
 }
A git conversion mirror of mandoc.bsd.lv