First, properly escape periods with \&. Then consistently refer to

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index a5ba2a1e7f3557c2617b6110c5d87a8c84cf08e8..c3b3f68b469146f18c9b2cc4447e512ee8570968 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.159 2011/04/04 16:01:47 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.163 2011/04/04 22:38:26 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -1086,9 +1086,9 @@ mdoc_bl_pre(MDOC_ARGS)
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
-       struct tag              *t;
-       struct htmlpair          tag;
+       struct tag      *t;
+       struct htmlpair  tag;
+       int              nchild;
 
        if (n->prev)
                print_otag(h, TAG_BR, 0, NULL);
@@ -1096,22 +1096,25 @@ mdoc_ex_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag, "utility");
 
        print_text(h, "The");
-       for (nn = n->child; nn; nn = nn->next) {
+
+       nchild = n->nchild;
+       for (n = n->child; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);
+
                t = print_otag(h, TAG_B, 1, &tag);
-               print_text(h, nn->string);
+               print_text(h, n->string);
                print_tagq(h, t);
 
-               h->flags |= HTML_NOSPACE;
-
-               if (nn->next && NULL == nn->next->next)
-                       print_text(h, ", and");
-               else if (nn->next)
+               if (nchild > 2 && n->next) {
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
-               else
-                       h->flags &= ~HTML_NOSPACE;
+               }
+
+               if (n->next && NULL == n->next->next)
+                       print_text(h, "and");
        }
 
-       if (n->child && n->child->next)
+       if (nchild > 1)
                print_text(h, "utilities exit");
        else
                print_text(h, "utility exits");
@@ -1402,13 +1405,61 @@ mdoc_fa_pre(MDOC_ARGS)
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
-       struct htmlpair  tag;
+       struct htmlpair  tag[2];
+       char             buf[BUFSIZ];
+       size_t           sz;
+       int              i;
+       struct tag      *t;
 
        synopsis_pre(h, n);
 
-       PAIR_CLASS_INIT(&tag, "macro");
-       print_otag(h, TAG_B, 1, &tag);
-       return(1);
+       if (NULL == (n = n->child))
+               return(0);
+
+       assert(MDOC_TEXT == n->type);
+
+       if (strcmp(n->string, "#include")) {
+               PAIR_CLASS_INIT(&tag[0], "macro");
+               print_otag(h, TAG_B, 1, tag);
+               return(1);
+       }
+
+       PAIR_CLASS_INIT(&tag[0], "includes");
+       print_otag(h, TAG_B, 1, tag);
+       print_text(h, n->string);
+
+       if (NULL != (n = n->next)) {
+               assert(MDOC_TEXT == n->type);
+               strlcpy(buf, '<' == *n->string || '"' == *n->string ? 
+                               n->string + 1 : n->string, BUFSIZ);
+
+               sz = strlen(buf);
+               if (sz && ('>' == buf[sz - 1] || '"' == buf[sz - 1]))
+                       buf[sz - 1] = '\0';
+
+               PAIR_CLASS_INIT(&tag[0], "link-includes");
+               bufinit(h);
+               
+               i = 1;
+               if (h->base_includes) {
+                       buffmt_includes(h, buf);
+                       PAIR_HREF_INIT(&tag[i], h->buf);
+                       i++;
+               } 
+
+               t = print_otag(h, TAG_A, i, tag);
+               print_text(h, n->string);
+               print_tagq(h, t);
+
+               n = n->next;
+       }
+
+       for ( ; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);
+               print_text(h, n->string);
+       }
+
+       return(0);
 }
 
 
@@ -1507,6 +1558,7 @@ mdoc_fn_pre(MDOC_ARGS)
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
+       h->flags |= HTML_NOSPACE;
 
        bufinit(h);
        PAIR_CLASS_INIT(&tag[0], "farg");
@@ -1730,7 +1782,8 @@ mdoc_in_pre(MDOC_ARGS)
 
                if (h->base_includes) {
                        buffmt_includes(h, n->string);
-                       PAIR_HREF_INIT(&tag[i++], h->buf);
+                       PAIR_HREF_INIT(&tag[i], h->buf);
+                       i++;
                } 
 
                t = print_otag(h, TAG_A, i, tag);
@@ -1775,16 +1828,18 @@ mdoc_rv_pre(MDOC_ARGS)
        if (n->prev)
                print_otag(h, TAG_BR, 0, NULL);
 
+       PAIR_CLASS_INIT(&tag, "fname");
+
        print_text(h, "The");
 
        nchild = n->nchild;
        for (n = n->child; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
-               PAIR_CLASS_INIT(&tag, "fname");
 
                t = print_otag(h, TAG_B, 1, &tag);
                print_text(h, n->string);
                print_tagq(h, t);
+
                h->flags |= HTML_NOSPACE;
                print_text(h, "()");