Downstream maintainers: this removes UGLY! I don't want diverging

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index bebc0ac8cac39ecfa5fbd66807887661ebe539c4..1534e12c944b7cadd547cad71b61f0b35ba5267e 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,6 +1,6 @@
-/*     $Id: man_html.c,v 1.25 2010/01/01 17:14:28 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.39 2010/06/27 15:52:41 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 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
@@ -26,8 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
 #include "out.h"
 #include "html.h"
+#include "regs.h"
 #include "man.h"
 #include "main.h"
 
@@ -103,6 +105,10 @@ static     const struct htmlman mans[MAN_MAX] = {
        { 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 */
 };
 
 
@@ -114,7 +120,7 @@ html_man(void *arg, const struct man *m)
 
        h = (struct html *)arg;
 
-       print_gen_doctype(h);
+       print_gen_decls(h);
 
        t = print_otag(h, TAG_HTML, 0, NULL);
        print_man(man_meta(m), man_node(m), h);
@@ -153,7 +159,7 @@ print_man_head(MAN_ARGS)
 
        print_gen_head(h);
        bufinit(h);
-       buffmt(h, "%s(%d)", m->title, m->msec);
+       buffmt(h, "%s(%s)", m->title, m->msec);
 
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);
@@ -181,6 +187,12 @@ print_man_node(MAN_ARGS)
 
        bufinit(h);
 
+       /*
+        * 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.
+        */
+
        switch (n->type) {
        case (MAN_ROOT):
                child = man_root_pre(m, n, h);
@@ -240,7 +252,6 @@ a2width(const struct man_node *n, struct roffsu *su)
 }
 
 
-/* ARGSUSED */
 static int
 man_root_pre(MAN_ARGS)
 {
@@ -252,7 +263,7 @@ man_root_pre(MAN_ARGS)
        if (m->vol)
                (void)strlcat(b, m->vol, BUFSIZ);
 
-       snprintf(title, BUFSIZ - 1, "%s(%d)", m->title, m->msec);
+       snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
 
        PAIR_CLASS_INIT(&tag[0], "header");
        bufcat_style(h, "width", "100%");
@@ -297,7 +308,10 @@ man_root_post(MAN_ARGS)
        struct tag      *t, *tt;
        char             b[DATESIZ];
 
-       time2a(m->date, b, DATESIZ);
+       if (m->rawdate)
+               strlcpy(b, m->rawdate, DATESIZ);
+       else
+               time2a(m->date, b, DATESIZ);
 
        PAIR_CLASS_INIT(&tag[0], "footer");
        bufcat_style(h, "width", "100%");
@@ -335,10 +349,18 @@ man_br_pre(MAN_ARGS)
 
        SCALE_VS_INIT(&su, 1);
 
-       if (MAN_sp == n->tok && n->child)
-               a2roffsu(n->child->string, &su, SCALE_VS);
-       else if (MAN_br == n->tok)
+       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);
@@ -567,6 +589,8 @@ man_IP_pre(MAN_ARGS)
        SCALE_HS_INIT(&su, INDENT);
        width = 0;
 
+       /* Width is the last token. */
+
        if (MAN_IP == n->tok && NULL != nn)
                if (NULL != (nn = nn->next)) {
                        for ( ; nn->next; nn = nn->next)
@@ -574,8 +598,15 @@ man_IP_pre(MAN_ARGS)
                        width = a2width(nn, &su);
                }
 
-       if (MAN_TP == n->tok && NULL != nn)
-               width = 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)
+                       width = a2width(nn, &su);
+       }
 
        if (MAN_BLOCK == n->type) {
                bufcat_su(h, "margin-left", &su);
@@ -600,11 +631,20 @@ man_IP_pre(MAN_ARGS)
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
 
-       /* With a length string, manually omit the last child. */
+       /*
+        * Without a length string, we can print all of our children.
+        */
 
        if ( ! width)
                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).
+        */
+
        if (MAN_IP == n->tok)
                for (nn = n->child; nn->next; nn = nn->next)
                        print_man_node(m, nn, h);