enclosures sometimes cause bogus end-of-sentence

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 5bd4c0145ce74aa170a8f2e95cb82d9e1b1611e3..f1b022a4d8f2c8fd9a78153d4a0cacb007f1e72c 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.104 2010/09/04 20:18:53 kristaps Exp $ */
 /*
  * 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);
-               exit(EXIT_FAILURE);
+               exit((int)MANDOCLEVEL_SYSERR);
        }
        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) {
-               if (nn->prev && nn->prev->line < nn->line) {
-                       print_text(h, "\n");
-                       h->flags |= HTML_NOSPACE;
-               }
                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);
@@ -2194,6 +2194,9 @@ mdoc__x_pre(MDOC_ARGS)
        switch (n->tok) {
        case(MDOC__A):
                PAIR_CLASS_INIT(&tag[0], "ref-auth");
+               if (n->prev && MDOC__A == n->prev->tok)
+                       if (NULL == n->next || MDOC__A != n->next->tok)
+                               print_text(h, "and");
                break;
        case(MDOC__B):
                PAIR_CLASS_INIT(&tag[0], "ref-book");
@@ -2246,6 +2249,7 @@ mdoc__x_pre(MDOC_ARGS)
 
        PAIR_HREF_INIT(&tag[1], n->child->string);
        print_otag(h, TAG_A, 2, tag);
+
        return(1);
 }
 
@@ -2255,6 +2259,11 @@ static void
 mdoc__x_post(MDOC_ARGS)
 {
 
+       if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)
+               if (NULL == n->next->next || MDOC__A != n->next->next->tok)
+                       if (NULL == n->prev || MDOC__A != n->prev->tok)
+                               return;
+
        /* TODO: %U */
 
        h->flags |= HTML_NOSPACE;