Clarified EXIT STATUS sections. Discussed among schwarze@, Thomas, and

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 5bd4c0145ce74aa170a8f2e95cb82d9e1b1611e3..1ee5c07667e1ca1baf1c77b4e59edb546c81f4a5 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.100 2010/07/27 08:38:04 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.102 2010/08/20 01:02:07 schwarze Exp $ */

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


@@ -1183,7 +1183,7 @@ mdoc_bl_pre(MDOC_ARGS)
        ord = malloc(sizeof(struct ord));
        if (NULL == ord) {
                perror(NULL);
        ord = malloc(sizeof(struct ord));
        if (NULL == ord) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit(MANDOCLEVEL_SYSERR);

        }
        ord->cookie = n;
        ord->pos = 1;
        }
        ord->cookie = n;
        ord->pos = 1;


@@ -1457,11 +1457,11 @@ mdoc_bd_pre(MDOC_ARGS)
        print_otag(h, TAG_DIV, 2, tag);
 
        for (nn = n->child; nn; nn = nn->next) {
        print_otag(h, TAG_DIV, 2, tag);
 
        for (nn = n->child; nn; nn = nn->next) {

-               if (nn->prev && nn->prev->line < nn->line) {
-                       print_text(h, "\n");
-                       h->flags |= HTML_NOSPACE;
-               }

                print_mdoc_node(m, nn, h);
                print_mdoc_node(m, nn, h);

+               if (nn->next && nn->next->line == nn->line)
+                       continue;
+               print_text(h, "\n");
+               h->flags |= HTML_NOSPACE;

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