Make empty sections and parts (SH, SS, RS) only produce a warning if it

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 3cfab636173ae03de24eeebe91b7eda3161f697b..9656aced55e87bbaafeb2ed1ad9df7a15d7e3b39 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_html.c,v 1.140 2011/01/01 12:18:37 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.155 2011/03/22 14:05:45 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
@@ -410,6 +410,7 @@ print_mdoc_node(MDOC_ARGS)
 {
        int              child;
        struct tag      *t;
+       struct htmlpair  tag;
 
        child = 1;
        t = h->tags.head;
@@ -420,11 +421,47 @@ print_mdoc_node(MDOC_ARGS)
                child = mdoc_root_pre(m, n, h);
                break;
        case (MDOC_TEXT):
+               /* No tables in this mode... */
+               assert(NULL == h->tblt);
+
+               /*
+                * Make sure that if we're in a literal mode already
+                * (i.e., within a <PRE>) don't print the newline.
+                */
+               if (' ' == *n->string && MDOC_LINE & n->flags)
+                       if ( ! (HTML_LITERAL & h->flags))
+                               print_otag(h, TAG_BR, 0, NULL);
+               if (MDOC_DELIMC & n->flags)
+                       h->flags |= HTML_NOSPACE;
                print_text(h, n->string);
+               if (MDOC_DELIMO & n->flags)
+                       h->flags |= HTML_NOSPACE;
                return;
+       case (MDOC_EQN):
+               PAIR_CLASS_INIT(&tag, "eqn");
+               print_otag(h, TAG_SPAN, 1, &tag);
+               print_text(h, n->eqn->data);
+               break;
        case (MDOC_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:
+               /*
+                * 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;
+               }
+
+               assert(NULL == h->tblt);
                if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
                        child = (*mdocs[n->tok].pre)(m, n, h);
                break;
@@ -452,6 +489,8 @@ print_mdoc_node(MDOC_ARGS)
        case (MDOC_ROOT):
                mdoc_root_post(m, n, h);
                break;
+       case (MDOC_EQN):
+               break;
        default:
                if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
                        (*mdocs[n->tok].post)(m, n, h);
@@ -465,9 +504,6 @@ mdoc_root_post(MDOC_ARGS)
 {
        struct htmlpair  tag[3];
        struct tag      *t, *tt;
-       char             b[DATESIZ];
-
-       time2a(m->date, b, DATESIZ);
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
        PAIR_CLASS_INIT(&tag[1], "foot");
@@ -487,7 +523,7 @@ mdoc_root_post(MDOC_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");
@@ -753,7 +789,8 @@ static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
-       h->flags |= HTML_NOSPACE;
+       if ( ! (MDOC_LINE & n->flags))
+               h->flags |= HTML_NOSPACE;
        return(1);
 }
 
@@ -776,6 +813,7 @@ mdoc_xx_pre(MDOC_ARGS)
 {
        const char      *pp;
        struct htmlpair  tag;
+       int              flags;
 
        switch (n->tok) {
        case (MDOC_Bsx):
@@ -802,8 +840,15 @@ mdoc_xx_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
+
        print_text(h, pp);
-       return(1);
+       if (n->child) {
+               flags = h->flags;
+               h->flags |= HTML_KEEP;
+               print_text(h, n->child->string);
+               h->flags = flags;
+       }
+       return(0);
 }
 
 
@@ -811,22 +856,31 @@ mdoc_xx_pre(MDOC_ARGS)
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
+       struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
-       for (nn = n->child; nn; nn = nn->next)
-               print_mdoc_node(m, nn, h);
+       if (NULL != (n = n->child)) {
+               print_text(h, n->string);
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "BSD");
+       } else {
+               print_text(h, "BSD");
+               return(0);
+       }
 
-       if (n->child)
+       if (NULL != (n = n->next)) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "-");
                h->flags |= HTML_NOSPACE;
+               print_text(h, n->string);
+       }
 
-       print_text(h, "BSD");
        return(0);
 }
 
+/* ARGSUSED */
 static int
 mdoc_it_pre(MDOC_ARGS)
 {
@@ -941,7 +995,7 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
-       size_t           i;
+       int              i;
        struct htmlpair  tag[3];
        struct roffsu    su;
        char             buf[BUFSIZ];
@@ -963,10 +1017,10 @@ mdoc_bl_pre(MDOC_ARGS)
                 * screen and we want to preserve that behaviour.
                 */
 
-               for (i = 0; i < n->norm->Bl.ncols; i++) {
+               for (i = 0; i < (int)n->norm->Bl.ncols; i++) {
                        a2width(n->norm->Bl.cols[i], &su);
                        bufinit(h);
-                       if (i < n->norm->Bl.ncols - 1)
+                       if (i < (int)n->norm->Bl.ncols - 1)
                                bufcat_su(h, "width", &su);
                        else
                                bufcat_su(h, "min-width", &su);
@@ -1139,7 +1193,7 @@ static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
-       int                      comp;
+       int                      comp, sv;
        const struct mdoc_node  *nn;
        struct roffsu            su;
 
@@ -1178,6 +1232,11 @@ mdoc_bd_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[1], "lit display");
        print_otag(h, TAG_PRE, 2, tag);
 
+       /* This can be recursive: save & set our literal state. */
+
+       sv = h->flags & HTML_LITERAL;
+       h->flags |= HTML_LITERAL;
+
        for (nn = n->child; nn; nn = nn->next) {
                print_mdoc_node(m, nn, h);
                /*
@@ -1214,6 +1273,9 @@ mdoc_bd_pre(MDOC_ARGS)
                h->flags |= HTML_NOSPACE;
        }
 
+       if (0 == sv)
+               h->flags &= ~HTML_LITERAL;
+
        return(0);
 }
 
@@ -1323,12 +1385,16 @@ mdoc_fa_pre(MDOC_ARGS)
                t = print_otag(h, TAG_I, 1, &tag);
                print_text(h, nn->string);
                print_tagq(h, t);
-               if (nn->next)
+               if (nn->next) {
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
+               }
        }
 
-       if (n->child && n->next && n->next->tok == MDOC_Fa)
+       if (n->child && n->next && n->next->tok == MDOC_Fa) {
+               h->flags |= HTML_NOSPACE;
                print_text(h, ",");
+       }
 
        return(0);
 }
@@ -1456,13 +1522,19 @@ mdoc_fn_pre(MDOC_ARGS)
                t = print_otag(h, TAG_I, i, tag);
                print_text(h, nn->string);
                print_tagq(h, t);
-               if (nn->next)
+               if (nn->next) {
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
+               }
        }
 
+       h->flags |= HTML_NOSPACE;
        print_text(h, ")");
-       if (MDOC_SYNPRETTY & n->flags)
+
+       if (MDOC_SYNPRETTY & n->flags) {
+               h->flags |= HTML_NOSPACE;
                print_text(h, ";");
+       }
 
        return(0);
 }
@@ -1613,7 +1685,9 @@ mdoc_fo_post(MDOC_ARGS)
 
        if (MDOC_BODY != n->type)
                return;
+       h->flags |= HTML_NOSPACE;
        print_text(h, ")");
+       h->flags |= HTML_NOSPACE;
        print_text(h, ";");
 }
 
@@ -1974,6 +2048,7 @@ mdoc__x_post(MDOC_ARGS)
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 
+       h->flags |= HTML_NOSPACE;
        print_text(h, n->next ? "," : ".");
 }