]> git.cameronkatri.com Git - mandoc.git/blobdiff - html.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
recognize ".if n" as true;
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index 47a59a5cef05bbb547fc3d73daf46c5376b1311b..0ad84e4f99d3c7bef88ca28f9ff4d3595a1dee14 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.32 2009/09/17 08:21:42 kristaps Exp $ */
+/*     $Id: html.c,v 1.99 2010/04/12 19:45:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,73 +14,65 @@
  * 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 <sys/queue.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 
 #include <assert.h>
-#include <err.h>
+#include <ctype.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 
+#include "out.h"
 #include "chars.h"
 #include "chars.h"
-#include "mdoc.h"
-#include "man.h"
-
-#define        DOCTYPE         "-//W3C//DTD HTML 4.01//EN"
-#define        DTD             "http://www.w3.org/TR/html4/strict.dtd"
-
-enum   htmltag {
-       TAG_HTML,
-       TAG_HEAD,
-       TAG_BODY,
-       TAG_META,
-       TAG_TITLE,
-       TAG_DIV,
-       TAG_H1,
-       TAG_H2,
-       TAG_P,
-       TAG_SPAN,
-       TAG_LINK,
-       TAG_BR,
-       TAG_A,
-       TAG_MAX
-};
+#include "html.h"
+#include "main.h"
 
 
-enum   htmlattr {
-       ATTR_HTTPEQUIV,
-       ATTR_CONTENT,
-       ATTR_NAME,
-       ATTR_REL,
-       ATTR_HREF,
-       ATTR_TYPE,
-       ATTR_MEDIA,
-       ATTR_CLASS,
-       ATTR_MAX
-};
+#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
 
 struct htmldata {
 
 struct htmldata {
-       char             *name;
+       const char       *name;
        int               flags;
 #define        HTML_CLRLINE     (1 << 0)
 #define        HTML_NOSTACK     (1 << 1)
        int               flags;
 #define        HTML_CLRLINE     (1 << 0)
 #define        HTML_NOSTACK     (1 << 1)
+#define        HTML_AUTOCLOSE   (1 << 2) /* Tag has auto-closure. */
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
        {"html",        HTML_CLRLINE}, /* TAG_HTML */
        {"head",        HTML_CLRLINE}, /* TAG_HEAD */
        {"body",        HTML_CLRLINE}, /* TAG_BODY */
 };
 
 static const struct htmldata htmltags[TAG_MAX] = {
        {"html",        HTML_CLRLINE}, /* TAG_HTML */
        {"head",        HTML_CLRLINE}, /* TAG_HEAD */
        {"body",        HTML_CLRLINE}, /* TAG_BODY */
-       {"meta",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_META */
-       {"title",       HTML_CLRLINE | HTML_NOSTACK}, /* TAG_TITLE */
+       {"meta",        HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_META */
+       {"title",       HTML_CLRLINE}, /* TAG_TITLE */
        {"div",         HTML_CLRLINE}, /* TAG_DIV */
        {"h1",          0}, /* TAG_H1 */
        {"h2",          0}, /* TAG_H2 */
        {"div",         HTML_CLRLINE}, /* TAG_DIV */
        {"h1",          0}, /* TAG_H1 */
        {"h2",          0}, /* TAG_H2 */
-       {"p",           HTML_CLRLINE}, /* TAG_P */
        {"span",        0}, /* TAG_SPAN */
        {"span",        0}, /* TAG_SPAN */
-       {"link",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */
-       {"br",          HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */
+       {"link",        HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_LINK */
+       {"br",          HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */
        {"a",           0}, /* TAG_A */
        {"a",           0}, /* TAG_A */
+       {"table",       HTML_CLRLINE}, /* TAG_TABLE */
+       {"col",         HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_COL */
+       {"tr",          HTML_CLRLINE}, /* TAG_TR */
+       {"td",          HTML_CLRLINE}, /* TAG_TD */
+       {"li",          HTML_CLRLINE}, /* TAG_LI */
+       {"ul",          HTML_CLRLINE}, /* TAG_UL */
+       {"ol",          HTML_CLRLINE}, /* TAG_OL */
+};
+
+static const char      *const htmlfonts[HTMLFONT_MAX] = {
+       "roman",
+       "bold",
+       "italic"
 };
 
 };
 
-static const char       *const htmlattrs[ATTR_MAX] = {
+static const char      *const htmlattrs[ATTR_MAX] = {
        "http-equiv",
        "content",
        "name",
        "http-equiv",
        "content",
        "name",
@@ -88,605 +80,413 @@ static    const char       *const htmlattrs[ATTR_MAX] = {
        "href",
        "type",
        "media",
        "href",
        "type",
        "media",
-       "class"
-};
-
-struct htmlpair {
-       enum htmlattr     key;
-       char             *val;
-};
-
-struct tag {
-       enum htmltag      tag;
-       SLIST_ENTRY(tag)  entry;
+       "class",
+       "style",
+       "width",
+       "valign",
+       "target",
+       "id",
+       "summary",
 };
 
 };
 
-SLIST_HEAD(tagq, tag);
-
-struct html {
-       int               flags;
-#define        HTML_NOSPACE     (1 << 0)
-#define        HTML_NEWLINE     (1 << 1)
-       struct tagq       stack;
-       void             *symtab;
-};
-
-#define        MDOC_ARGS         const struct mdoc_meta *m, \
-                         const struct mdoc_node *n, \
-                         struct html *h
-#define        MAN_ARGS          const struct man_meta *m, \
-                         const struct man_node *n, \
-                         struct html *h
-struct htmlmdoc {
-       int             (*pre)(MDOC_ARGS);
-       void            (*post)(MDOC_ARGS);
-};
-
-static void              print_gen_doctype(struct html *);
-static void              print_gen_head(struct html *);
-static void              print_mdoc(MDOC_ARGS);
-static void              print_mdoc_head(MDOC_ARGS);
-static void              print_mdoc_title(MDOC_ARGS);
-static void              print_mdoc_node(MDOC_ARGS);
-static void              print_man(MAN_ARGS);
-static void              print_man_head(MAN_ARGS);
-static void              print_man_body(MAN_ARGS);
-static struct tag       *print_otag(struct html *, enum htmltag, 
-                               int, const struct htmlpair *);
-static void              print_tagq(struct html *, const struct tag *);
-static void              print_stagq(struct html *, const struct tag *);
+static void              print_spec(struct html *, const char *, size_t);
+static void              print_res(struct html *, const char *, size_t);
 static void              print_ctag(struct html *, enum htmltag);
 static void              print_ctag(struct html *, enum htmltag);
-static void              print_encode(struct html *, const char *);
-static void              print_escape(struct html *, const char **);
-static void              print_text(struct html *, const char *);
-static void              print_res(struct html *, const char *, int);
-static void              print_spec(struct html *, const char *, int);
-static int               mdoc_root_pre(MDOC_ARGS);
-
-static int               mdoc_ar_pre(MDOC_ARGS);
-static int               mdoc_fl_pre(MDOC_ARGS);
-static int               mdoc_nd_pre(MDOC_ARGS);
-static int               mdoc_nm_pre(MDOC_ARGS);
-static int               mdoc_ns_pre(MDOC_ARGS);
-static int               mdoc_op_pre(MDOC_ARGS);
-static void              mdoc_op_post(MDOC_ARGS);
-static int               mdoc_pp_pre(MDOC_ARGS);
-static int               mdoc_sh_pre(MDOC_ARGS);
-static int               mdoc_ss_pre(MDOC_ARGS);
-static int               mdoc_xr_pre(MDOC_ARGS);
-
-static const struct htmlmdoc mdocs[MDOC_MAX] = {
-       {NULL, NULL}, /* Ap */
-       {NULL, NULL}, /* Dd */
-       {NULL, NULL}, /* Dt */
-       {NULL, NULL}, /* Os */
-       {mdoc_sh_pre, NULL }, /* Sh */
-       {mdoc_ss_pre, NULL }, /* Ss */ 
-       {mdoc_pp_pre, NULL}, /* Pp */ 
-       {NULL, NULL}, /* D1 */
-       {NULL, NULL}, /* Dl */
-       {NULL, NULL}, /* Bd */
-       {NULL, NULL}, /* Ed */
-       {NULL, NULL}, /* Bl */
-       {NULL, NULL}, /* El */
-       {NULL, NULL}, /* It */
-       {NULL, NULL}, /* Ad */ 
-       {NULL, NULL}, /* An */
-       {mdoc_ar_pre, NULL}, /* Ar */
-       {NULL, NULL}, /* Cd */
-       {NULL, NULL}, /* Cm */
-       {NULL, NULL}, /* Dv */ 
-       {NULL, NULL}, /* Er */ 
-       {NULL, NULL}, /* Ev */ 
-       {NULL, NULL}, /* Ex */
-       {NULL, NULL}, /* Fa */ 
-       {NULL, NULL}, /* Fd */ 
-       {mdoc_fl_pre, NULL}, /* Fl */
-       {NULL, NULL}, /* Fn */ 
-       {NULL, NULL}, /* Ft */ 
-       {NULL, NULL}, /* Ic */ 
-       {NULL, NULL}, /* In */ 
-       {NULL, NULL}, /* Li */
-       {mdoc_nd_pre, NULL}, /* Nd */ 
-       {mdoc_nm_pre, NULL}, /* Nm */ 
-       {mdoc_op_pre, mdoc_op_post}, /* Op */
-       {NULL, NULL}, /* Ot */
-       {NULL, NULL}, /* Pa */
-       {NULL, NULL}, /* Rv */
-       {NULL, NULL}, /* St */ 
-       {NULL, NULL}, /* Va */
-       {NULL, NULL}, /* Vt */ 
-       {mdoc_xr_pre, NULL}, /* Xr */
-       {NULL, NULL}, /* %A */
-       {NULL, NULL}, /* %B */
-       {NULL, NULL}, /* %D */
-       {NULL, NULL}, /* %I */
-       {NULL, NULL}, /* %J */
-       {NULL, NULL}, /* %N */
-       {NULL, NULL}, /* %O */
-       {NULL, NULL}, /* %P */
-       {NULL, NULL}, /* %R */
-       {NULL, NULL}, /* %T */
-       {NULL, NULL}, /* %V */
-       {NULL, NULL}, /* Ac */
-       {NULL, NULL}, /* Ao */
-       {NULL, NULL}, /* Aq */
-       {NULL, NULL}, /* At */
-       {NULL, NULL}, /* Bc */
-       {NULL, NULL}, /* Bf */ 
-       {NULL, NULL}, /* Bo */
-       {NULL, NULL}, /* Bq */
-       {NULL, NULL}, /* Bsx */
-       {NULL, NULL}, /* Bx */
-       {NULL, NULL}, /* Db */
-       {NULL, NULL}, /* Dc */
-       {NULL, NULL}, /* Do */
-       {NULL, NULL}, /* Dq */
-       {NULL, NULL}, /* Ec */
-       {NULL, NULL}, /* Ef */
-       {NULL, NULL}, /* Em */ 
-       {NULL, NULL}, /* Eo */
-       {NULL, NULL}, /* Fx */
-       {NULL, NULL}, /* Ms */
-       {NULL, NULL}, /* No */
-       {mdoc_ns_pre, NULL}, /* Ns */
-       {NULL, NULL}, /* Nx */
-       {NULL, NULL}, /* Ox */
-       {NULL, NULL}, /* Pc */
-       {NULL, NULL}, /* Pf */
-       {NULL, NULL}, /* Po */
-       {NULL, NULL}, /* Pq */
-       {NULL, NULL}, /* Qc */
-       {NULL, NULL}, /* Ql */
-       {NULL, NULL}, /* Qo */
-       {NULL, NULL}, /* Qq */
-       {NULL, NULL}, /* Re */
-       {NULL, NULL}, /* Rs */
-       {NULL, NULL}, /* Sc */
-       {NULL, NULL}, /* So */
-       {NULL, NULL}, /* Sq */
-       {NULL, NULL}, /* Sm */
-       {NULL, NULL}, /* Sx */
-       {NULL, NULL}, /* Sy */
-       {NULL, NULL}, /* Tn */
-       {NULL, NULL}, /* Ux */
-       {NULL, NULL}, /* Xc */
-       {NULL, NULL}, /* Xo */
-       {NULL, NULL}, /* Fo */ 
-       {NULL, NULL}, /* Fc */ 
-       {NULL, NULL}, /* Oo */
-       {NULL, NULL}, /* Oc */
-       {NULL, NULL}, /* Bk */
-       {NULL, NULL}, /* Ek */
-       {NULL, NULL}, /* Bt */
-       {NULL, NULL}, /* Hf */
-       {NULL, NULL}, /* Fr */
-       {NULL, NULL}, /* Ud */
-       {NULL, NULL}, /* Lb */
-       {NULL, NULL}, /* Lp */ 
-       {NULL, NULL}, /* Lk */ 
-       {NULL, NULL}, /* Mt */ 
-       {NULL, NULL}, /* Brq */ 
-       {NULL, NULL}, /* Bro */ 
-       {NULL, NULL}, /* Brc */ 
-       {NULL, NULL}, /* %C */ 
-       {NULL, NULL}, /* Es */ 
-       {NULL, NULL}, /* En */ 
-       {NULL, NULL}, /* Dx */ 
-       {NULL, NULL}, /* %Q */ 
-       {NULL, NULL}, /* br */
-       {NULL, NULL}, /* sp */ 
-};
+static void              print_doctype(struct html *);
+static void              print_xmltype(struct html *);
+static int               print_encode(struct html *, const char *, int);
+static void              print_metaf(struct html *, enum roffdeco);
+static void              print_attr(struct html *, 
+                               const char *, const char *);
+static void             *ml_alloc(char *, enum htmltype);
 
 
-void
-html_mdoc(void *arg, const struct mdoc *m)
+
+static void *
+ml_alloc(char *outopts, enum htmltype type)
 {
 {
-       struct html     *h;
-       struct tag      *t;
+       struct html     *h;
+       const char      *toks[4];
+       char            *v;
+
+       toks[0] = "style";
+       toks[1] = "man";
+       toks[2] = "includes";
+       toks[3] = NULL;
+
+       h = calloc(1, sizeof(struct html));
+       if (NULL == h) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }
 
 
-       h = (struct html *)arg;
+       h->type = type;
+       h->tags.head = NULL;
+       h->ords.head = NULL;
+       h->symtab = chars_init(CHARS_HTML);
 
 
-       print_gen_doctype(h);
-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_mdoc(mdoc_meta(m), mdoc_node(m), h);
-       print_tagq(h, t);
+       while (outopts && *outopts)
+               switch (getsubopt(&outopts, UNCONST(toks), &v)) {
+               case (0):
+                       h->style = v;
+                       break;
+               case (1):
+                       h->base_man = v;
+                       break;
+               case (2):
+                       h->base_includes = v;
+                       break;
+               default:
+                       break;
+               }
 
 
-       printf("\n");
+       return(h);
 }
 
 }
 
-void
-html_man(void *arg, const struct man *m)
+void *
+html_alloc(char *outopts)
 {
 {
-       struct html     *h;
-       struct tag      *t;
-
-       h = (struct html *)arg;
 
 
-       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);
-
-       printf("\n");
+       return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
 }
 
 }
 
+
 void *
 void *
-html_alloc(void)
+xhtml_alloc(char *outopts)
 {
 {
-       struct html     *h;
-
-       if (NULL == (h = calloc(1, sizeof(struct html))))
-               return(NULL);
 
 
-       SLIST_INIT(&h->stack);
-       if (NULL == (h->symtab = chars_init(CHARS_HTML))) {
-               free(h);
-               return(NULL);
-       }
-       return(h);
+       return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
 }
 
 }
 
+
 void
 html_free(void *p)
 {
        struct tag      *tag;
 void
 html_free(void *p)
 {
        struct tag      *tag;
+       struct ord      *ord;
        struct html     *h;
 
        h = (struct html *)p;
 
        struct html     *h;
 
        h = (struct html *)p;
 
-       while ( ! SLIST_EMPTY(&h->stack)) {
-               tag = SLIST_FIRST(&h->stack);
-               SLIST_REMOVE_HEAD(&h->stack, entry);
+       while ((ord = h->ords.head) != NULL) { 
+               h->ords.head = ord->next;
+               free(ord);
+       }
+
+       while ((tag = h->tags.head) != NULL) {
+               h->tags.head = tag->next;       
                free(tag);
        }
                free(tag);
        }
+       
+       if (h->symtab)
+               chars_free(h->symtab);
+
        free(h);
 }
 
        free(h);
 }
 
-static void
-print_mdoc(MDOC_ARGS)
-{
-       struct tag      *t;
 
 
-       t = print_otag(h, TAG_HEAD, 0, NULL);
-       print_mdoc_head(m, n, h);
-       print_tagq(h, t);
-
-       t = print_otag(h, TAG_BODY, 0, NULL);
-       print_mdoc_title(m, n, h);
-       print_mdoc_node(m, n, h);
-       print_tagq(h, t);
-}
-
-static void
+void
 print_gen_head(struct html *h)
 {
 print_gen_head(struct html *h)
 {
-       struct htmlpair  meta0[2];
-       struct htmlpair  meta1[2];
-       struct htmlpair  link[4];
-
-       meta0[0].key = ATTR_HTTPEQUIV;
-       meta0[0].val = "Content-Type";
-       meta0[1].key = ATTR_CONTENT;
-       meta0[1].val = "text/html; charest-utf-8";
-
-       meta1[0].key = ATTR_NAME;
-       meta1[0].val = "resource-type";
-       meta1[1].key = ATTR_CONTENT;
-       meta1[1].val = "document";
-
-       link[0].key = ATTR_REL;
-       link[0].val = "stylesheet";
-       link[1].key = ATTR_HREF;
-       link[1].val = "style.css"; /* XXX */
-       link[2].key = ATTR_TYPE;
-       link[2].val = "text/css";
-       link[3].key = ATTR_MEDIA;
-       link[3].val = "all";
-
-       print_otag(h, TAG_META, 2, meta0);
-       print_otag(h, TAG_META, 2, meta1);
-       print_otag(h, TAG_LINK, 4, link);
-}
-
-/* ARGSUSED */
-static void
-print_mdoc_head(MDOC_ARGS)
-{
-
-       print_gen_head(h);
-       print_otag(h, TAG_TITLE, 0, NULL);
-       print_encode(h, m->title);
+       struct htmlpair  tag[4];
+
+       tag[0].key = ATTR_HTTPEQUIV;
+       tag[0].val = "Content-Type";
+       tag[1].key = ATTR_CONTENT;
+       tag[1].val = "text/html; charset=utf-8";
+       print_otag(h, TAG_META, 2, tag);
+
+       tag[0].key = ATTR_NAME;
+       tag[0].val = "resource-type";
+       tag[1].key = ATTR_CONTENT;
+       tag[1].val = "document";
+       print_otag(h, TAG_META, 2, tag);
+
+       if (h->style) {
+               tag[0].key = ATTR_REL;
+               tag[0].val = "stylesheet";
+               tag[1].key = ATTR_HREF;
+               tag[1].val = h->style;
+               tag[2].key = ATTR_TYPE;
+               tag[2].val = "text/css";
+               tag[3].key = ATTR_MEDIA;
+               tag[3].val = "all";
+               print_otag(h, TAG_LINK, 4, tag);
+       }
 }
 
 }
 
-/* ARGSUSED */
-static void
-print_mdoc_title(MDOC_ARGS)
-{
-
-       /* TODO */
-}
 
 static void
 
 static void
-print_mdoc_node(MDOC_ARGS)
+print_spec(struct html *h, const char *p, size_t len)
 {
 {
-       int              child;
-       struct tag      *t;
-
-       child = 1;
-       t = SLIST_FIRST(&h->stack);
-
-       switch (n->type) {
-       case (MDOC_ROOT):
-               child = mdoc_root_pre(m, n, h);
-               break;
-       case (MDOC_TEXT):
-               print_text(h, n->string);
-               break;
-       default:
-               if (mdocs[n->tok].pre)
-                       child = (*mdocs[n->tok].pre)(m, n, h);
-               break;
-       }
-
-       if (child && n->child)
-               print_mdoc_node(m, n->child, h);
-
-       print_stagq(h, t);
+       const char      *rhs;
+       size_t           sz;
 
 
-       switch (n->type) {
-       case (MDOC_ROOT):
-               break;
-       case (MDOC_TEXT):
-               break;
-       default:
-               if (mdocs[n->tok].post)
-                       (*mdocs[n->tok].post)(m, n, h);
-               break;
-       }
+       rhs = chars_a2ascii(h->symtab, p, len, &sz);
 
 
-       if (n->next)
-               print_mdoc_node(m, n->next, h);
+       if (NULL == rhs) 
+               return;
+       fwrite(rhs, 1, sz, stdout);
 }
 
 }
 
+
 static void
 static void
-print_man(MAN_ARGS)
+print_res(struct html *h, const char *p, size_t len)
 {
 {
-       struct tag      *t;
+       const char      *rhs;
+       size_t           sz;
 
 
-       t = print_otag(h, TAG_HEAD, 0, NULL);
-       print_man_head(m, n, h);
-       print_tagq(h, t);
+       rhs = chars_a2res(h->symtab, p, len, &sz);
 
 
-       t = print_otag(h, TAG_BODY, 0, NULL);
-       print_man_body(m, n, h);
-       print_tagq(h, t);
+       if (NULL == rhs)
+               return;
+       fwrite(rhs, 1, sz, stdout);
 }
 
 }
 
-/* ARGSUSED */
-static void
-print_man_head(MAN_ARGS)
-{
-
-       print_gen_head(h);
-       print_otag(h, TAG_TITLE, 0, NULL);
-       print_encode(h, m->title);
-}
 
 
-/* ARGSUSED */
-static void
-print_man_body(MAN_ARGS)
+struct tag *
+print_ofont(struct html *h, enum htmlfont font)
 {
 {
+       struct htmlpair  tag;
 
 
-       /* TODO */
-}
+       h->metal = h->metac;
+       h->metac = font;
 
 
-static void
-print_spec(struct html *h, const char *p, int len)
-{
-       const char      *rhs;
-       int              i;
-       size_t           sz;
+       /* FIXME: DECO_ROMAN should just close out preexisting. */
 
 
-       rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz);
+       if (h->metaf && h->tags.head == h->metaf)
+               print_tagq(h, h->metaf);
 
 
-       if (NULL == rhs) 
-               return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
+       PAIR_CLASS_INIT(&tag, htmlfonts[font]);
+       h->metaf = print_otag(h, TAG_SPAN, 1, &tag);
+       return(h->metaf);
 }
 
 }
 
+
 static void
 static void
-print_res(struct html *h, const char *p, int len)
+print_metaf(struct html *h, enum roffdeco deco)
 {
 {
-       const char      *rhs;
-       int              i;
-       size_t           sz;
+       enum htmlfont    font;
 
 
-       rhs = chars_a2res(h->symtab, p, (size_t)len, &sz);
+       switch (deco) {
+       case (DECO_PREVIOUS):
+               font = h->metal;
+               break;
+       case (DECO_ITALIC):
+               font = HTMLFONT_ITALIC;
+               break;
+       case (DECO_BOLD):
+               font = HTMLFONT_BOLD;
+               break;
+       case (DECO_ROMAN):
+               font = HTMLFONT_NONE;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
 
 
-       if (NULL == rhs)
-               return;
-       for (i = 0; i < (int)sz; i++) 
-               putchar(rhs[i]);
+       (void)print_ofont(h, font);
 }
 
 }
 
-static void
-print_escape(struct html *h, const char **p)
-{
-       int              j, type;
-       const char      *wp;
-
-       wp = *p;
-       type = 1;
-
-       if (0 == *(++wp)) {
-               *p = wp;
-               return;
-       }
 
 
-       if ('(' == *wp) {
-               wp++;
-               if (0 == *wp || 0 == *(wp + 1)) {
-                       *p = 0 == *wp ? wp : wp + 1;
-                       return;
-               }
+static int
+print_encode(struct html *h, const char *p, int norecurse)
+{
+       size_t           sz;
+       int              len, nospace;
+       const char      *seq;
+       enum roffdeco    deco;
 
 
-               print_spec(h, wp, 2);
-               *p = ++wp;
-               return;
+       nospace = 0;
 
 
-       } else if ('*' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
-               }
+       for (; *p; p++) {
+               sz = strcspn(p, "\\<>&");
 
 
-               switch (*wp) {
-               case ('('):
-                       wp++;
-                       if (0 == *wp || 0 == *(wp + 1)) {
-                               *p = 0 == *wp ? wp : wp + 1;
-                               return;
-                       }
+               fwrite(p, 1, sz, stdout);
+               p += /* LINTED */
+                       sz;
 
 
-                       print_res(h, wp, 2);
-                       *p = ++wp;
-                       return;
-               case ('['):
-                       type = 0;
+               if ('<' == *p) {
+                       printf("&lt;");
+                       continue;
+               } else if ('>' == *p) {
+                       printf("&gt;");
+                       continue;
+               } else if ('&' == *p) {
+                       printf("&amp;");
+                       continue;
+               } else if ('\0' == *p)
                        break;
                        break;
-               default:
-                       print_res(h, wp, 1);
-                       *p = wp;
-                       return;
-               }
-       
-       } else if ('f' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
-               }
 
 
-               switch (*wp) {
-               case ('B'):
-                       /* TODO */
+               seq = ++p;
+               len = a2roffdeco(&deco, &seq, &sz);
+
+               switch (deco) {
+               case (DECO_RESERVED):
+                       print_res(h, seq, sz);
                        break;
                        break;
-               case ('I'):
-                       /* TODO */
+               case (DECO_SPECIAL):
+                       print_spec(h, seq, sz);
                        break;
                        break;
-               case ('P'):
+               case (DECO_PREVIOUS):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case ('R'):
-                       /* TODO */
+               case (DECO_BOLD):
+                       /* FALLTHROUGH */
+               case (DECO_ITALIC):
+                       /* FALLTHROUGH */
+               case (DECO_ROMAN):
+                       if (norecurse)
+                               break;
+                       print_metaf(h, deco);
                        break;
                default:
                        break;
                }
 
                        break;
                default:
                        break;
                }
 
-               *p = wp;
-               return;
+               p += len - 1;
 
 
-       } else if ('[' != *wp) {
-               print_spec(h, wp, 1);
-               *p = wp;
-               return;
+               if (DECO_NOSPACE == deco && '\0' == *(p + 1))
+                       nospace = 1;
        }
 
        }
 
-       wp++;
-       for (j = 0; *wp && ']' != *wp; wp++, j++)
-               /* Loop... */ ;
-
-       if (0 == *wp) {
-               *p = wp;
-               return;
-       }
-
-       if (type)
-               print_spec(h, wp - j, j);
-       else
-               print_res(h, wp - j, j);
-
-       *p = wp;
+       return(nospace);
 }
 
 
 static void
 }
 
 
 static void
-print_encode(struct html *h, const char *p)
+print_attr(struct html *h, const char *key, const char *val)
 {
 {
-
-       for (; *p; p++) {
-               if ('\\' != *p) {
-                       putchar(*p);
-                       continue;
-               }
-               print_escape(h, &p);
-       }
+       printf(" %s=\"", key);
+       (void)print_encode(h, val, 1);
+       putchar('\"');
 }
 
 
 }
 
 
-static struct tag *
+struct tag *
 print_otag(struct html *h, enum htmltag tag, 
                int sz, const struct htmlpair *p)
 {
        int              i;
        struct tag      *t;
 
 print_otag(struct html *h, enum htmltag tag, 
                int sz, const struct htmlpair *p)
 {
        int              i;
        struct tag      *t;
 
+       /* Push this tags onto the stack of open scopes. */
+
        if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
        if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
-               if (NULL == (t = malloc(sizeof(struct tag))))
-                       err(EXIT_FAILURE, "malloc");
+               t = malloc(sizeof(struct tag));
+               if (NULL == t) {
+                       perror(NULL);
+                       exit(EXIT_FAILURE);
+               }
                t->tag = tag;
                t->tag = tag;
-               SLIST_INSERT_HEAD(&h->stack, t, entry);
+               t->next = h->tags.head;
+               h->tags.head = t;
        } else
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))
                if ( ! (HTML_CLRLINE & htmltags[tag].flags))
        } else
                t = NULL;
 
        if ( ! (HTML_NOSPACE & h->flags))
                if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       printf(" ");
+                       putchar(' ');
+
+       /* Print out the tag name and attributes. */
 
        printf("<%s", htmltags[tag].name);
 
        printf("<%s", htmltags[tag].name);
-       for (i = 0; i < sz; i++) {
-               printf(" %s=\"", htmlattrs[p[i].key]);
-               assert(p->val);
-               print_encode(h, p[i].val);
-               printf("\"");
+       for (i = 0; i < sz; i++)
+               print_attr(h, htmlattrs[p[i].key], p[i].val);
+
+       /* Add non-overridable attributes. */
+
+       if (TAG_HTML == tag && HTML_XHTML_1_0_STRICT == h->type) {
+               print_attr(h, "xmlns", "http://www.w3.org/1999/xhtml");
+               print_attr(h, "xml:lang", "en");
+               print_attr(h, "lang", "en");
        }
        }
-       printf(">");
 
 
-       h->flags |= HTML_NOSPACE;
-       if (HTML_CLRLINE & htmltags[tag].flags)
-               h->flags |= HTML_NEWLINE;
-       else
-               h->flags &= ~HTML_NEWLINE;
+       /* Accomodate for XML "well-formed" singleton escaping. */
+
+       if (HTML_AUTOCLOSE & htmltags[tag].flags)
+               switch (h->type) {
+               case (HTML_XHTML_1_0_STRICT):
+                       putchar('/');
+                       break;
+               default:
+                       break;
+               }
 
 
+       putchar('>');
+
+       h->flags |= HTML_NOSPACE;
        return(t);
 }
 
 
        return(t);
 }
 
 
-/* ARGSUSED */
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
        
        printf("</%s>", htmltags[tag].name);
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
        
        printf("</%s>", htmltags[tag].name);
-       if (HTML_CLRLINE & htmltags[tag].flags)
+       if (HTML_CLRLINE & htmltags[tag].flags) {
                h->flags |= HTML_NOSPACE;
                h->flags |= HTML_NOSPACE;
-       if (HTML_CLRLINE & htmltags[tag].flags)
-               h->flags |= HTML_NEWLINE;
-       else
-               h->flags &= ~HTML_NEWLINE;
+               putchar('\n');
+       } 
+}
+
+
+void
+print_gen_decls(struct html *h)
+{
+
+       print_xmltype(h);
+       print_doctype(h);
 }
 
 
 }
 
 
-/* ARGSUSED */
 static void
 static void
-print_gen_doctype(struct html *h)
+print_xmltype(struct html *h)
 {
 {
-       
-       printf("<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">\n", DOCTYPE, DTD);
+       const char      *decl;
+
+       switch (h->type) {
+       case (HTML_XHTML_1_0_STRICT):
+               decl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+               break;
+       default:
+               decl = NULL;
+               break;
+       }
+
+       if (NULL == decl)
+               return;
+
+       printf("%s\n", decl);
 }
 
 
 static void
 }
 
 
 static void
+print_doctype(struct html *h)
+{
+       const char      *doctype;
+       const char      *dtd;
+       const char      *name;
+
+       switch (h->type) {
+       case (HTML_HTML_4_01_STRICT):
+               name = "HTML";
+               doctype = "-//W3C//DTD HTML 4.01//EN";
+               dtd = "http://www.w3.org/TR/html4/strict.dtd";
+               break;
+       default:
+               name = "html";
+               doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
+               dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
+               break;
+       }
+
+       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
+                       name, doctype, dtd);
+}
+
+
+void
 print_text(struct html *h, const char *p)
 {
 
 print_text(struct html *h, const char *p)
 {
 
@@ -707,30 +507,29 @@ print_text(struct html *h, const char *p)
                case(')'):
                        /* FALLTHROUGH */
                case(']'):
                case(')'):
                        /* FALLTHROUGH */
                case(']'):
-                       /* FALLTHROUGH */
-               case('}'):
-                       h->flags |= HTML_NOSPACE;
+                       if ( ! (HTML_IGNDELIM & h->flags))
+                               h->flags |= HTML_NOSPACE;
                        break;
                default:
                        break;
                }
 
        if ( ! (h->flags & HTML_NOSPACE))
                        break;
                default:
                        break;
                }
 
        if ( ! (h->flags & HTML_NOSPACE))
-               printf(" ");
+               putchar(' ');
 
 
-       h->flags &= ~HTML_NOSPACE;
-       h->flags &= ~HTML_NEWLINE;
-
-       if (p)
-               print_encode(h, p);
+       assert(p);
+       if ( ! print_encode(h, p, 0))
+               h->flags &= ~HTML_NOSPACE;
 
 
+       /* 
+        * Note that we don't process the pipe: the parser sees it as
+        * punctuation, but we don't in terms of typography.
+        */
        if (*p && 0 == *(p + 1))
                switch (*p) {
                case('('):
                        /* FALLTHROUGH */
                case('['):
        if (*p && 0 == *(p + 1))
                switch (*p) {
                case('('):
                        /* FALLTHROUGH */
                case('['):
-                       /* FALLTHROUGH */
-               case('{'):
                        h->flags |= HTML_NOSPACE;
                        break;
                default:
                        h->flags |= HTML_NOSPACE;
                        break;
                default:
@@ -739,15 +538,16 @@ print_text(struct html *h, const char *p)
 }
 
 
 }
 
 
-static void
+void
 print_tagq(struct html *h, const struct tag *until)
 {
        struct tag      *tag;
 
 print_tagq(struct html *h, const struct tag *until)
 {
        struct tag      *tag;
 
-       while ( ! SLIST_EMPTY(&h->stack)) {
-               tag = SLIST_FIRST(&h->stack);
+       while ((tag = h->tags.head) != NULL) {
+               if (tag == h->metaf)
+                       h->metaf = NULL;
                print_ctag(h, tag->tag);
                print_ctag(h, tag->tag);
-               SLIST_REMOVE_HEAD(&h->stack, entry);
+               h->tags.head = tag->next;
                free(tag);
                if (until && tag == until)
                        return;
                free(tag);
                if (until && tag == until)
                        return;
@@ -755,191 +555,203 @@ print_tagq(struct html *h, const struct tag *until)
 }
 
 
 }
 
 
-static void
+void
 print_stagq(struct html *h, const struct tag *suntil)
 {
        struct tag      *tag;
 
 print_stagq(struct html *h, const struct tag *suntil)
 {
        struct tag      *tag;
 
-       while ( ! SLIST_EMPTY(&h->stack)) {
-               tag = SLIST_FIRST(&h->stack);
+       while ((tag = h->tags.head) != NULL) {
                if (suntil && tag == suntil)
                        return;
                if (suntil && tag == suntil)
                        return;
+               if (tag == h->metaf)
+                       h->metaf = NULL;
                print_ctag(h, tag->tag);
                print_ctag(h, tag->tag);
-               SLIST_REMOVE_HEAD(&h->stack, entry);
+               h->tags.head = tag->next;
                free(tag);
        }
 }
 
 
                free(tag);
        }
 }
 
 
-/* ARGSUSED */
-static int
-mdoc_root_pre(MDOC_ARGS)
+void
+bufinit(struct html *h)
 {
 {
-       struct htmlpair  tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "body";
 
 
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(1);
+       h->buf[0] = '\0';
+       h->buflen = 0;
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-mdoc_ss_pre(MDOC_ARGS)
+void
+bufcat_style(struct html *h, const char *key, const char *val)
 {
 
 {
 
-       if (MDOC_BODY == n->type)
-               print_otag(h, TAG_P, 0, NULL);
-       if (MDOC_HEAD == n->type)
-               print_otag(h, TAG_H2, 0, NULL);
-       return(1);
+       bufcat(h, key);
+       bufncat(h, ":", 1);
+       bufcat(h, val);
+       bufncat(h, ";", 1);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-mdoc_fl_pre(MDOC_ARGS)
+void
+bufcat(struct html *h, const char *p)
 {
 {
-       struct htmlpair  tag;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "flag";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       print_text(h, "\\-");
-       h->flags |= HTML_NOSPACE;
-       return(1);
+       bufncat(h, p, strlen(p));
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-mdoc_pp_pre(MDOC_ARGS)
+void
+buffmt(struct html *h, const char *fmt, ...)
 {
 {
+       va_list          ap;
 
 
-       print_otag(h, TAG_BR, 0, NULL);
-       print_otag(h, TAG_BR, 0, NULL);
-       return(0);
+       va_start(ap, fmt);
+       (void)vsnprintf(h->buf + (int)h->buflen, 
+                       BUFSIZ - h->buflen - 1, fmt, ap);
+       va_end(ap);
+       h->buflen = strlen(h->buf);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-mdoc_nd_pre(MDOC_ARGS)
+void
+bufncat(struct html *h, const char *p, size_t sz)
 {
 
 {
 
-       if (MDOC_BODY == n->type)
-               print_text(h, "\\(en");
-       return(1);
+       if (h->buflen + sz > BUFSIZ - 1)
+               sz = BUFSIZ - 1 - h->buflen;
+
+       (void)strncat(h->buf, p, sz);
+       h->buflen += sz;
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-mdoc_op_pre(MDOC_ARGS)
+void
+buffmt_includes(struct html *h, const char *name)
 {
 {
+       const char      *p, *pp;
 
 
-       if (MDOC_BODY == n->type) {
-               print_text(h, "\\(lB");
-               h->flags |= HTML_NOSPACE;
+       pp = h->base_includes;
+       
+       while (NULL != (p = strchr(pp, '%'))) {
+               bufncat(h, pp, (size_t)(p - pp));
+               switch (*(p + 1)) {
+               case('I'):
+                       bufcat(h, name);
+                       break;
+               default:
+                       bufncat(h, p, 2);
+                       break;
+               }
+               pp = p + 2;
        }
        }
-       return(1);
+       if (pp)
+               bufcat(h, pp);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static void
-mdoc_op_post(MDOC_ARGS)
+void
+buffmt_man(struct html *h, 
+               const char *name, const char *sec)
 {
 {
+       const char      *p, *pp;
 
 
-       if (MDOC_BODY != n->type) 
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rB");
+       pp = h->base_man;
+       
+       /* LINTED */
+       while (NULL != (p = strchr(pp, '%'))) {
+               bufncat(h, pp, (size_t)(p - pp));
+               switch (*(p + 1)) {
+               case('S'):
+                       bufcat(h, sec ? sec : "1");
+                       break;
+               case('N'):
+                       buffmt(h, name);
+                       break;
+               default:
+                       bufncat(h, p, 2);
+                       break;
+               }
+               pp = p + 2;
+       }
+       if (pp)
+               bufcat(h, pp);
 }
 
 
 }
 
 
-static int
-mdoc_nm_pre(MDOC_ARGS)
+void
+bufcat_su(struct html *h, const char *p, const struct roffsu *su)
 {
 {
-       struct htmlpair class;
+       double           v;
+       const char      *u;
 
 
-       if ( ! (HTML_NEWLINE & h->flags))
-               if (SEC_SYNOPSIS == n->sec)
-                       print_otag(h, TAG_BR, 0, NULL);
-
-       class.key = ATTR_CLASS;
-       class.val = "name";
-
-       print_otag(h, TAG_SPAN, 1, &class);
-       if (NULL == n->child)
-               print_text(h, m->name);
-
-       return(1);
-}
+       v = su->scale;
 
 
+       switch (su->unit) {
+       case (SCALE_CM):
+               u = "cm";
+               break;
+       case (SCALE_IN):
+               u = "in";
+               break;
+       case (SCALE_PC):
+               u = "pc";
+               break;
+       case (SCALE_PT):
+               u = "pt";
+               break;
+       case (SCALE_EM):
+               u = "em";
+               break;
+       case (SCALE_MM):
+               if (0 == (v /= 100))
+                       v = 1;
+               u = "em";
+               break;
+       case (SCALE_EN):
+               u = "ex";
+               break;
+       case (SCALE_BU):
+               u = "ex";
+               break;
+       case (SCALE_VS):
+               u = "em";
+               break;
+       default:
+               u = "ex";
+               break;
+       }
 
 
-/* ARGSUSED */
-static int
-mdoc_sh_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY == n->type)
-               print_otag(h, TAG_P, 0, NULL);
-       if (MDOC_HEAD == n->type)
-               print_otag(h, TAG_H1, 0, NULL);
-       return(1);
+       if (su->pt)
+               buffmt(h, "%s: %f%s;", p, v, u);
+       else
+               /* LINTED */
+               buffmt(h, "%s: %d%s;", p, (int)v, u);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-mdoc_xr_pre(MDOC_ARGS)
+void
+html_idcat(char *dst, const char *src, int sz)
 {
 {
-       struct htmlpair tag;
+       int              ssz;
 
 
-       tag.key = ATTR_HREF;
-       tag.val = "#"; /* TODO */
+       assert(sz);
 
 
-       print_otag(h, TAG_A, 1, &tag);
+       /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
 
-       n = n->child;
-       print_text(h, n->string);
-       if (NULL == (n = n->next))
-               return(0);
+       for ( ; *dst != '\0' && sz; dst++, sz--)
+               /* Jump to end. */ ;
 
 
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "(");
-       h->flags |= HTML_NOSPACE;
-       print_text(h, n->string);
-       h->flags |= HTML_NOSPACE;
-       print_text(h, ")");
+       assert(sz > 2);
 
 
-       return(0);
-}
+       /* We can't start with a number (bah). */
 
 
+       *dst++ = 'x';
+       *dst = '\0';
+       sz--;
 
 
-/* ARGSUSED */
-static int
-mdoc_ns_pre(MDOC_ARGS)
-{
-
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_ar_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "arg";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       for ( ; *src != '\0' && sz > 1; src++) {
+               ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
+               sz -= ssz;
+               dst += ssz;
+       }
 }
 }
A git conversion mirror of mandoc.bsd.lv