Getting version ready.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index fa8fcbf34e445c9652fc51a7f809078a761f5a64..0ba4bea36894dcb8533e4339aedfe07b2d65bcb8 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.48 2009/11/16 08:46:59 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.61 2010/04/08 08:17:55 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,8 +14,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <sys/types.h>
 #include <sys/types.h>

-#include <sys/param.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -36,6 +39,10 @@
                          const struct mdoc_node *n, \
                          struct html *h
 
                          const struct mdoc_node *n, \
                          struct html *h
 

+#ifndef MIN
+#define        MIN(a,b)        ((/*CONSTCOND*/(a)<(b))?(a):(b))
+#endif
+

 struct htmlmdoc {
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);
 struct htmlmdoc {
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);


@@ -126,11 +133,6 @@ static     int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 

-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
-

 static const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_ap_pre, NULL}, /* Ap */
        {NULL, NULL}, /* Dd */
 static const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_ap_pre, NULL}, /* Ap */
        {NULL, NULL}, /* Dd */


@@ -198,7 +200,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Dc */
        {mdoc_dq_pre, mdoc_dq_post}, /* Do */
        {mdoc_dq_pre, mdoc_dq_post}, /* Dq */
        {NULL, NULL}, /* Dc */
        {mdoc_dq_pre, mdoc_dq_post}, /* Do */
        {mdoc_dq_pre, mdoc_dq_post}, /* Dq */

-       {NULL, NULL}, /* Ec */
+       {NULL, NULL}, /* Ec */ /* FIXME: no space */

        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Eo */
        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Eo */


@@ -264,7 +266,7 @@ html_mdoc(void *arg, const struct mdoc *m)
 
        h = (struct html *)arg;
 
 
        h = (struct html *)arg;
 

-       print_gen_doctype(h);
+       print_gen_decls(h);

        t = print_otag(h, TAG_HTML, 0, NULL);
        print_mdoc(mdoc_meta(m), mdoc_node(m), h);
        print_tagq(h, t);
        t = print_otag(h, TAG_HTML, 0, NULL);
        print_mdoc(mdoc_meta(m), mdoc_node(m), h);
        print_tagq(h, t);


@@ -587,14 +589,9 @@ mdoc_sh_pre(MDOC_ARGS)
                        html_idcat(buf, " ", BUFSIZ);
        }
 
                        html_idcat(buf, " ", BUFSIZ);
        }
 

-       /* 
-        * TODO: make sure there are no duplicates, as HTML does not
-        * allow for multiple `id' tags of the same name.
-        */
-

        PAIR_CLASS_INIT(&tag[0], "sec-head");
        PAIR_CLASS_INIT(&tag[0], "sec-head");

-       tag[1].key = ATTR_ID;
-       tag[1].val = buf;
+       PAIR_ID_INIT(&tag[1], buf);
+

        print_otag(h, TAG_DIV, 2, tag);
        return(1);
 }
        print_otag(h, TAG_DIV, 2, tag);
        return(1);
 }


@@ -646,8 +643,8 @@ mdoc_ss_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag[0], "ssec-head");
        PAIR_STYLE_INIT(&tag[1], h);
 
        PAIR_CLASS_INIT(&tag[0], "ssec-head");
        PAIR_STYLE_INIT(&tag[1], h);

-       tag[2].key = ATTR_ID;
-       tag[2].val = buf;
+       PAIR_ID_INIT(&tag[2], buf);
+

        print_otag(h, TAG_DIV, 3, tag);
        return(1);
 }
        print_otag(h, TAG_DIV, 3, tag);
        return(1);
 }


@@ -661,10 +658,19 @@ mdoc_fl_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "flag");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "flag");
        print_otag(h, TAG_SPAN, 1, &tag);

-       if (MDOC_Fl == n->tok) {
-               print_text(h, "\\-");
+
+       /* `Cm' has no leading hyphen. */
+
+       if (MDOC_Cm == n->tok)
+               return(1);
+
+       print_text(h, "\\-");
+
+       if (n->child)

                h->flags |= HTML_NOSPACE;
                h->flags |= HTML_NOSPACE;

-       }
+       else if (n->next && n->next->line == n->line)
+               h->flags |= HTML_NOSPACE;
+

        return(1);
 }
 
        return(1);
 }
 


@@ -745,14 +751,16 @@ mdoc_xr_pre(MDOC_ARGS)
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
 
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
 

+       if (NULL == n->child)
+               return(0);
+

        PAIR_CLASS_INIT(&tag[0], "link-man");
 
        if (h->base_man) {
                buffmt_man(h, n->child->string, 
                                n->child->next ? 
                                n->child->next->string : NULL);
        PAIR_CLASS_INIT(&tag[0], "link-man");
 
        if (h->base_man) {
                buffmt_man(h, n->child->string, 
                                n->child->next ? 
                                n->child->next->string : NULL);

-               tag[1].key = ATTR_HREF;
-               tag[1].val = h->buf;
+               PAIR_HREF_INIT(&tag[1], h->buf);

                print_otag(h, TAG_A, 2, tag);
        } else
                print_otag(h, TAG_A, 1, tag);
                print_otag(h, TAG_A, 2, tag);
        } else
                print_otag(h, TAG_A, 1, tag);


@@ -1108,6 +1116,8 @@ mdoc_bl_pre(MDOC_ARGS)
 {
        struct ord      *ord;
 
 {
        struct ord      *ord;
 

+       if (MDOC_HEAD == n->type)
+               return(0);

        if (MDOC_BLOCK != n->type)
                return(1);
        if (MDOC_Enum != a2list(n))
        if (MDOC_BLOCK != n->type)
                return(1);
        if (MDOC_Enum != a2list(n))


@@ -1295,8 +1305,6 @@ mdoc_sx_pre(MDOC_ARGS)
        const struct mdoc_node  *nn;
        char                     buf[BUFSIZ];
 
        const struct mdoc_node  *nn;
        char                     buf[BUFSIZ];
 

-       /* FIXME: duplicates? */
-

        strlcpy(buf, "#", BUFSIZ);
        for (nn = n->child; nn; nn = nn->next) {
                html_idcat(buf, nn->string, BUFSIZ);
        strlcpy(buf, "#", BUFSIZ);
        for (nn = n->child; nn; nn = nn->next) {
                html_idcat(buf, nn->string, BUFSIZ);


@@ -1305,8 +1313,7 @@ mdoc_sx_pre(MDOC_ARGS)
        }
 
        PAIR_CLASS_INIT(&tag[0], "link-sec");
        }
 
        PAIR_CLASS_INIT(&tag[0], "link-sec");

-       tag[1].key = ATTR_HREF;
-       tag[1].val = buf;
+       PAIR_HREF_INIT(&tag[1], buf);

 
        print_otag(h, TAG_A, 2, tag);
        return(1);
 
        print_otag(h, TAG_A, 2, tag);
        return(1);


@@ -1381,6 +1388,7 @@ mdoc_bd_pre(MDOC_ARGS)
                }
 
        /* FIXME: -centered, etc. formatting. */
                }
 
        /* FIXME: -centered, etc. formatting. */

+       /* FIXME: does not respect -offset ??? */

 
        if (MDOC_BLOCK == n->type) {
                bufcat_su(h, "margin-left", &su);
 
        if (MDOC_BLOCK == n->type) {
                bufcat_su(h, "margin-left", &su);


@@ -1572,7 +1580,7 @@ mdoc_vt_pre(MDOC_ARGS)
        struct htmlpair  tag;
        struct roffsu    su;
 
        struct htmlpair  tag;
        struct roffsu    su;
 

-       if (SEC_SYNOPSIS == n->sec) {
+       if (SEC_SYNOPSIS == n->sec && MDOC_BLOCK == n->type) {

                if (n->next && MDOC_Vt != n->next->tok) {
                        SCALE_VS_INIT(&su, 1);
                        bufcat_su(h, "margin-bottom", &su);
                if (n->next && MDOC_Vt != n->next->tok) {
                        SCALE_VS_INIT(&su, 1);
                        bufcat_su(h, "margin-bottom", &su);


@@ -1580,7 +1588,10 @@ mdoc_vt_pre(MDOC_ARGS)
                        print_otag(h, TAG_DIV, 1, &tag);
                } else
                        print_otag(h, TAG_DIV, 0, NULL);
                        print_otag(h, TAG_DIV, 1, &tag);
                } else
                        print_otag(h, TAG_DIV, 0, NULL);

-       }
+               
+               return(1);
+       } else if (MDOC_HEAD == n->type)
+               return(0);

 
        PAIR_CLASS_INIT(&tag, "type");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "type");
        print_otag(h, TAG_SPAN, 1, &tag);


@@ -1593,17 +1604,9 @@ static int
 mdoc_ft_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 mdoc_ft_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;

-       struct roffsu    su;

 
 

-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->prev && MDOC_Fo == n->prev->tok) {
-                       SCALE_VS_INIT(&su, 1);
-                       bufcat_su(h, "margin-top", &su);
-                       PAIR_STYLE_INIT(&tag, h);
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
+       if (SEC_SYNOPSIS == n->sec)
+               print_otag(h, TAG_DIV, 0, NULL);

 
        PAIR_CLASS_INIT(&tag, "ftype");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "ftype");
        print_otag(h, TAG_SPAN, 1, &tag);


@@ -1657,10 +1660,27 @@ mdoc_fn_pre(MDOC_ARGS)
        }
 
        PAIR_CLASS_INIT(&tag[0], "fname");
        }
 
        PAIR_CLASS_INIT(&tag[0], "fname");

+
+       /*
+        * FIXME: only refer to IDs that we know exist.
+        */
+
+#if 0
+       if (SEC_SYNOPSIS == n->sec) {
+               nbuf[0] = '\0';
+               html_idcat(nbuf, sp, BUFSIZ);
+               PAIR_ID_INIT(&tag[1], nbuf);
+       } else {
+               strlcpy(nbuf, "#", BUFSIZ);
+               html_idcat(nbuf, sp, BUFSIZ);
+               PAIR_HREF_INIT(&tag[1], nbuf);
+       }
+#endif
+

        t = print_otag(h, TAG_SPAN, 1, tag);
 
        if (sp) {
        t = print_otag(h, TAG_SPAN, 1, tag);
 
        if (sp) {

-               (void)strlcpy(nbuf, sp, BUFSIZ);
+               strlcpy(nbuf, sp, BUFSIZ);

                print_text(h, nbuf);
        }
 
                print_text(h, nbuf);
        }
 


@@ -1761,8 +1781,7 @@ mdoc_lk_pre(MDOC_ARGS)
        nn = n->child;
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");
        nn = n->child;
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");

-       tag[1].key = ATTR_HREF;
-       tag[1].val = nn->string;
+       PAIR_HREF_INIT(&tag[1], nn->string);

        print_otag(h, TAG_A, 2, tag);
 
        if (NULL == nn->next) 
        print_otag(h, TAG_A, 2, tag);
 
        if (NULL == nn->next) 


@@ -1789,7 +1808,7 @@ mdoc_mt_pre(MDOC_ARGS)
                bufinit(h);
                bufcat(h, "mailto:");
                bufcat(h, nn->string);
                bufinit(h);
                bufcat(h, "mailto:");
                bufcat(h, nn->string);

-               PAIR_STYLE_INIT(&tag[1], h);
+               PAIR_HREF_INIT(&tag[1], h->buf);

                t = print_otag(h, TAG_A, 2, tag);
                print_text(h, nn->string);
                print_tagq(h, t);
                t = print_otag(h, TAG_A, 2, tag);
                print_text(h, nn->string);
                print_tagq(h, t);


@@ -1804,14 +1823,20 @@ static int
 mdoc_fo_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 mdoc_fo_pre(MDOC_ARGS)
 {
        struct htmlpair tag;

+       struct roffsu   su;

 
        if (MDOC_BODY == n->type) {
                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return(1);
 
        if (MDOC_BODY == n->type) {
                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return(1);

-       } else if (MDOC_BLOCK == n->type)
+       } else if (MDOC_BLOCK == n->type && n->next) {
+               SCALE_VS_INIT(&su, 1);
+               bufcat_su(h, "margin-bottom", &su);
+               PAIR_STYLE_INIT(&tag, h);
+               print_otag(h, TAG_DIV, 1, &tag);

                return(1);
                return(1);

+       }

 
        PAIR_CLASS_INIT(&tag, "fname");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "fname");
        print_otag(h, TAG_SPAN, 1, &tag);


@@ -1871,8 +1896,8 @@ mdoc_in_pre(MDOC_ARGS)
                bufinit(h);
                if (h->base_includes) {
                        buffmt_includes(h, nn->string);
                bufinit(h);
                if (h->base_includes) {
                        buffmt_includes(h, nn->string);

-                       tag[i].key = ATTR_HREF;
-                       tag[i++].val = h->buf;
+                       PAIR_HREF_INIT(&tag[i], h->buf);
+                       i++;

                }
                t = print_otag(h, TAG_A, i, tag);
                print_mdoc_node(m, nn, h);
                }
                t = print_otag(h, TAG_A, i, tag);
                print_mdoc_node(m, nn, h);


@@ -2197,8 +2222,6 @@ mdoc__x_pre(MDOC_ARGS)
                break;
        case(MDOC__T):
                PAIR_CLASS_INIT(&tag[0], "ref-title");
                break;
        case(MDOC__T):
                PAIR_CLASS_INIT(&tag[0], "ref-title");

-               print_text(h, "\\(lq");
-               h->flags |= HTML_NOSPACE;

                break;
        case(MDOC__U):
                PAIR_CLASS_INIT(&tag[0], "link-ref");
                break;
        case(MDOC__U):
                PAIR_CLASS_INIT(&tag[0], "link-ref");


@@ -2227,14 +2250,8 @@ static void
 mdoc__x_post(MDOC_ARGS)
 {
 
 mdoc__x_post(MDOC_ARGS)
 {
 

+       /* TODO: %U */
+

        h->flags |= HTML_NOSPACE;
        h->flags |= HTML_NOSPACE;

-       switch (n->tok) {
-       case (MDOC__T):
-               print_text(h, "\\(rq");
-               h->flags |= HTML_NOSPACE;
-               break;
-       default:
-               break;
-       }

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