Put tbl_alloc function right into the addspan() one, as this is the only

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 986ded45b114679eac6a84aec2fe4d5160e7a5b3..e11127d24a739bd1560043cde3b3a2d903b2e8c4 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.61 2011/01/04 10:31:15 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.68 2011/02/06 21:44:36 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -67,7 +67,7 @@ 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 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);
@@ -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 */
@@ -183,37 +183,67 @@ print_man_node(MAN_ARGS)
 
        child = 1;
        t = h->tags.head;
-
        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, mh, h);
+               man_root_pre(m, n, mh, h);
                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);
-               if (MANH_LITERAL & mh->fl)
+
+               /*
+                * 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):
+               return;
        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);
-               break;
+               return;
        default:
                /* 
                 * 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 (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)
                        child = (*mans[n->tok].pre)(m, n, mh, h);
                break;
@@ -231,8 +261,6 @@ print_man_node(MAN_ARGS)
        case (MAN_ROOT):
                man_root_post(m, n, mh, h);
                break;
-       case (MAN_TBL):
-               break;
        default:
                if (mans[n->tok].post)
                        (*mans[n->tok].post)(m, n, mh, h);
@@ -255,7 +283,7 @@ a2width(const struct man_node *n, struct roffsu *su)
 
 
 /* ARGSUSED */
-static int
+static void
 man_root_pre(MAN_ARGS)
 {
        struct htmlpair  tag[3];
@@ -309,7 +337,6 @@ man_root_pre(MAN_ARGS)
 
        print_text(h, title);
        print_tagq(h, t);
-       return(1);
 }
 
 
@@ -505,7 +532,6 @@ 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
@@ -523,13 +549,12 @@ man_IP_pre(MAN_ARGS)
                n->head->child : n->parent->head->child;
 
        SCALE_HS_INIT(&su, INDENT);
-       width = 0;
 
        /* Width is the second token. */
 
        if (MAN_IP == n->tok && NULL != nn)
                if (NULL != (nn = nn->next))
-                       width = a2width(nn, &su);
+                       a2width(nn, &su);
 
        /* Width is the first token. */
 
@@ -538,7 +563,7 @@ man_IP_pre(MAN_ARGS)
                while (nn && MAN_TEXT != nn->type)
                        nn = nn->next;
                if (nn)
-                       width = a2width(nn, &su);
+                       a2width(nn, &su);
        }
 
        if (MAN_BLOCK == n->type) {
@@ -640,7 +665,7 @@ man_literal_pre(MAN_ARGS)
        } else
                mh->fl &= ~MANH_LITERAL;
 
-       return(1);
+       return(0);
 }