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 712cd92aa556de4e84714d94c35fa5f92dbae154..9656aced55e87bbaafeb2ed1ad9df7a15d7e3b39 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.153 2011/02/09 09:52:47 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.155 2011/03/22 14:05:45 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -431,7 +431,11 @@ print_mdoc_node(MDOC_ARGS)
                if (' ' == *n->string && MDOC_LINE & n->flags)
                        if ( ! (HTML_LITERAL & h->flags))
                                print_otag(h, TAG_BR, 0, NULL);
                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);
                print_text(h, n->string);

+               if (MDOC_DELIMO & n->flags)
+                       h->flags |= HTML_NOSPACE;

                return;
        case (MDOC_EQN):
                PAIR_CLASS_INIT(&tag, "eqn");
                return;
        case (MDOC_EQN):
                PAIR_CLASS_INIT(&tag, "eqn");


@@ -500,9 +504,6 @@ mdoc_root_post(MDOC_ARGS)
 {
        struct htmlpair  tag[3];
        struct tag      *t, *tt;
 {
        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");
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
        PAIR_CLASS_INIT(&tag[1], "foot");


@@ -522,7 +523,7 @@ mdoc_root_post(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[0], "foot-date");
        print_otag(h, TAG_TD, 1, tag);
 
        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");
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");


@@ -1384,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);
                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, ",");
                        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, ",");
                print_text(h, ",");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1517,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);
                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, ",");
                        print_text(h, ",");

+               }

        }
 
        }
 

+       h->flags |= HTML_NOSPACE;

        print_text(h, ")");
        print_text(h, ")");

-       if (MDOC_SYNPRETTY & n->flags)
+
+       if (MDOC_SYNPRETTY & n->flags) {
+               h->flags |= HTML_NOSPACE;

                print_text(h, ";");
                print_text(h, ";");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1674,7 +1685,9 @@ mdoc_fo_post(MDOC_ARGS)
 
        if (MDOC_BODY != n->type)
                return;
 
        if (MDOC_BODY != n->type)
                return;

+       h->flags |= HTML_NOSPACE;

        print_text(h, ")");
        print_text(h, ")");

+       h->flags |= HTML_NOSPACE;

        print_text(h, ";");
 }
 
        print_text(h, ";");
 }
 


@@ -2035,6 +2048,7 @@ mdoc__x_post(MDOC_ARGS)
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 

+       h->flags |= HTML_NOSPACE;

        print_text(h, n->next ? "," : ".");
 }
 
        print_text(h, n->next ? "," : ".");
 }