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 1110b5483dc41b0ab0a81aac5ce513e77e1c7be5..73953ecdd21868e221d59e283674f27c5de6b788 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,6 +1,6 @@
-/*     $Id: man_html.c,v 1.66 2011/01/13 14:30:13 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.72 2011/05/17 11:34:31 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
@@ -100,7 +100,7 @@ static      const struct htmlman mans[MAN_MAX] = {
        { man_I_pre, NULL }, /* I */
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */
-       { NULL, NULL }, /* na */
+       { man_ign_pre, NULL }, /* na */
        { man_br_pre, NULL }, /* sp */
        { man_literal_pre, NULL }, /* nf */
        { man_literal_pre, NULL }, /* fi */
@@ -157,9 +157,7 @@ print_man_head(MAN_ARGS)
 {
 
        print_gen_head(h);
-       bufinit(h);
-       buffmt(h, "%s(%s)", 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);
 }
@@ -180,10 +178,10 @@ print_man_node(MAN_ARGS)
 {
        int              child;
        struct tag      *t;
+       struct htmlpair  tag;
 
        child = 1;
        t = h->tags.head;
-       bufinit(h);
 
        switch (n->type) {
        case (MAN_ROOT):
@@ -215,6 +213,11 @@ print_man_node(MAN_ARGS)
                                 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;
        case (MAN_TBL):
                /*
                 * This will take care of initialising all of the table
@@ -253,12 +256,12 @@ print_man_node(MAN_ARGS)
        /* 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, mh, h);
                break;
+       case (MAN_EQN):
+               break;
        default:
                if (mans[n->tok].post)
                        (*mans[n->tok].post)(m, n, mh, h);
@@ -344,12 +347,6 @@ man_root_post(MAN_ARGS)
 {
        struct htmlpair  tag[3];
        struct tag      *t, *tt;
-       char             b[DATESIZ];
-
-       if (m->rawdate)
-               strlcpy(b, m->rawdate, DATESIZ);
-       else
-               time2a(m->date, b, DATESIZ);
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
        PAIR_CLASS_INIT(&tag[1], "foot");
@@ -367,7 +364,7 @@ man_root_post(MAN_ARGS)
        PAIR_CLASS_INIT(&tag[0], "foot-date");
        print_otag(h, TAG_TD, 1, tag);
 
-       print_text(h, b);
+       print_text(h, m->date);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");
@@ -399,6 +396,7 @@ man_br_pre(MAN_ARGS)
        } else
                su.scale = 0;
 
+       bufinit(h);
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
@@ -567,6 +565,7 @@ man_IP_pre(MAN_ARGS)
        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);
@@ -602,6 +601,8 @@ man_HP_pre(MAN_ARGS)
        struct roffsu    su;
        const struct man_node *np;
 
+       bufinit(h);
+
        np = MAN_BLOCK == n->type ? 
                n->head->child : 
                n->parent->head->child;
@@ -663,7 +664,7 @@ man_literal_pre(MAN_ARGS)
        } else
                mh->fl &= ~MANH_LITERAL;
 
-       return(1);
+       return(0);
 }
 
 
@@ -702,6 +703,7 @@ man_RS_pre(MAN_ARGS)
        if (n->head->child)
                a2width(n->head->child, &su);
 
+       bufinit(h);
        bufcat_su(h, "margin-left", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);