Warn about missing mlinks.

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 2dfb3e16f57fbb2ea7cb110f27ce4e9411835cdc..9cd9b286df04d8c7a5a3e95ba1bb1a7b41784ad3 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,6 +1,7 @@
-/*     $Id: man_html.c,v 1.78 2011/07/07 13:54:36 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.92 2014/03/30 19:47:48 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -36,9 +37,8 @@
 /* FIXME: have PD set the default vspace width. */
 
 #define        INDENT            5
 /* FIXME: have PD set the default vspace width. */
 
 #define        INDENT            5

-#define        HALFINDENT        3

 
 

-#define        MAN_ARGS          const struct man_meta *m, \
+#define        MAN_ARGS          const struct man_meta *man, \

                          const struct man_node *n, \
                          struct mhtml *mh, \
                          struct html *h
                          const struct man_node *n, \
                          struct mhtml *mh, \
                          struct html *h


@@ -59,26 +59,26 @@ static      void              print_man(MAN_ARGS);
 static void              print_man_head(MAN_ARGS);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
 static void              print_man_head(MAN_ARGS);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);

-

 static int               a2width(const struct man_node *,
                                struct roffsu *);
 static int               a2width(const struct man_node *,
                                struct roffsu *);

-
-static int               man_alt_pre(MAN_ARGS);
-static int               man_br_pre(MAN_ARGS);
-static int               man_ign_pre(MAN_ARGS);
-static int               man_in_pre(MAN_ARGS);
-static int               man_literal_pre(MAN_ARGS);
-static void              man_root_post(MAN_ARGS);
-static void              man_root_pre(MAN_ARGS);

 static int               man_B_pre(MAN_ARGS);
 static int               man_HP_pre(MAN_ARGS);
 static int               man_B_pre(MAN_ARGS);
 static int               man_HP_pre(MAN_ARGS);

-static int               man_I_pre(MAN_ARGS);

 static int               man_IP_pre(MAN_ARGS);
 static int               man_IP_pre(MAN_ARGS);

+static int               man_I_pre(MAN_ARGS);
+static int               man_OP_pre(MAN_ARGS);

 static int               man_PP_pre(MAN_ARGS);
 static int               man_RS_pre(MAN_ARGS);
 static int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);
 static int               man_PP_pre(MAN_ARGS);
 static int               man_RS_pre(MAN_ARGS);
 static int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);

+static int               man_UR_pre(MAN_ARGS);
+static int               man_alt_pre(MAN_ARGS);
+static int               man_br_pre(MAN_ARGS);
+static int               man_ign_pre(MAN_ARGS);
+static int               man_in_pre(MAN_ARGS);
+static int               man_literal_pre(MAN_ARGS);
+static void              man_root_post(MAN_ARGS);
+static void              man_root_pre(MAN_ARGS);

 
 static const struct htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */
 
 static const struct htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */


@@ -114,6 +114,12 @@ static     const struct htmlman mans[MAN_MAX] = {
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */
        { man_ign_pre, NULL }, /* ft */
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */
        { man_ign_pre, NULL }, /* ft */

+       { man_OP_pre, NULL }, /* OP */
+       { man_literal_pre, NULL }, /* EX */
+       { man_literal_pre, NULL }, /* EE */
+       { man_UR_pre, NULL }, /* UR */
+       { NULL, NULL }, /* UE */
+       { man_ign_pre, NULL }, /* ll */

 };
 
 /*
 };
 
 /*


@@ -140,36 +146,35 @@ print_bvspace(struct html *h, const struct man_node *n)
 }
 
 void
 }
 
 void

-html_man(void *arg, const struct man *m)
+html_man(void *arg, const struct man *man)

 {
 {

-       struct html     *h;
-       struct tag      *t;

        struct mhtml     mh;
 
        struct mhtml     mh;
 

-       h = (struct html *)arg;
-
-       print_gen_decls(h);
-

        memset(&mh, 0, sizeof(struct mhtml));
        memset(&mh, 0, sizeof(struct mhtml));

-
-       t = print_otag(h, TAG_HTML, 0, NULL);
-       print_man(man_meta(m), man_node(m), &mh, h);
-       print_tagq(h, t);
-
-       printf("\n");
+       print_man(man_meta(man), man_node(man), &mh, (struct html *)arg);
+       putchar('\n');

 }
 
 static void
 print_man(MAN_ARGS) 
 {
 }
 
 static void
 print_man(MAN_ARGS) 
 {

-       struct tag      *t;
+       struct tag      *t, *tt;
+       struct htmlpair  tag;

 
 

-       t = print_otag(h, TAG_HEAD, 0, NULL);
-       print_man_head(m, n, mh, h);
-       print_tagq(h, t);
+       PAIR_CLASS_INIT(&tag, "mandoc");

 
 

-       t = print_otag(h, TAG_BODY, 0, NULL);
-       print_man_nodelist(m, n, mh, h);
+       if ( ! (HTML_FRAGMENT & h->oflags)) {
+               print_gen_decls(h);
+               t = print_otag(h, TAG_HTML, 0, NULL);
+               tt = print_otag(h, TAG_HEAD, 0, NULL);
+               print_man_head(man, n, mh, h);
+               print_tagq(h, tt);
+               print_otag(h, TAG_BODY, 0, NULL);
+               print_otag(h, TAG_DIV, 1, &tag);
+       } else 
+               t = print_otag(h, TAG_DIV, 1, &tag);
+
+       print_man_nodelist(man, n, mh, h);

        print_tagq(h, t);
 }
 
        print_tagq(h, t);
 }
 


@@ -180,7 +185,9 @@ print_man_head(MAN_ARGS)
 {
 
        print_gen_head(h);
 {
 
        print_gen_head(h);

-       bufcat_fmt(h, "%s(%s)", m->title, m->msec);
+       assert(man->title);
+       assert(man->msec);
+       bufcat_fmt(h, "%s(%s)", man->title, man->msec);

        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);
 }
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);
 }


@@ -190,9 +197,9 @@ static void
 print_man_nodelist(MAN_ARGS)
 {
 
 print_man_nodelist(MAN_ARGS)
 {
 

-       print_man_node(m, n, mh, h);
+       print_man_node(man, n, mh, h);

        if (n->next)
        if (n->next)

-               print_man_nodelist(m, n->next, mh, h);
+               print_man_nodelist(man, n->next, mh, h);

 }
 
 
 }
 
 


@@ -201,14 +208,13 @@ print_man_node(MAN_ARGS)
 {
        int              child;
        struct tag      *t;
 {
        int              child;
        struct tag      *t;

-       struct htmlpair  tag;

 
        child = 1;
        t = h->tags.head;
 
        switch (n->type) {
        case (MAN_ROOT):
 
        child = 1;
        t = h->tags.head;
 
        switch (n->type) {
        case (MAN_ROOT):

-               man_root_pre(m, n, mh, h);
+               man_root_pre(man, n, mh, h);

                break;
        case (MAN_TEXT):
                /*
                break;
        case (MAN_TEXT):
                /*


@@ -229,9 +235,7 @@ print_man_node(MAN_ARGS)
                print_text(h, n->string);
                return;
        case (MAN_EQN):
                print_text(h, n->string);
                return;
        case (MAN_EQN):

-               PAIR_CLASS_INIT(&tag, "eqn");
-               print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, n->eqn->data);
+               print_eqn(h, n->eqn);

                break;
        case (MAN_TBL):
                /*
                break;
        case (MAN_TBL):
                /*


@@ -261,25 +265,25 @@ print_man_node(MAN_ARGS)
                        t = h->tags.head;
                }
                if (mans[n->tok].pre)
                        t = h->tags.head;
                }
                if (mans[n->tok].pre)

-                       child = (*mans[n->tok].pre)(m, n, mh, h);
+                       child = (*mans[n->tok].pre)(man, n, mh, h);

                break;
        }
 
        if (child && n->child)
                break;
        }
 
        if (child && n->child)

-               print_man_nodelist(m, n->child, mh, h);
+               print_man_nodelist(man, n->child, mh, h);

 
        /* This will automatically close out any font scope. */
        print_stagq(h, t);
 
        switch (n->type) {
        case (MAN_ROOT):
 
        /* This will automatically close out any font scope. */
        print_stagq(h, t);
 
        switch (n->type) {
        case (MAN_ROOT):

-               man_root_post(m, n, mh, h);
+               man_root_post(man, n, mh, h);

                break;
        case (MAN_EQN):
                break;
        default:
                if (mans[n->tok].post)
                break;
        case (MAN_EQN):
                break;
        default:
                if (mans[n->tok].post)

-                       (*mans[n->tok].post)(m, n, mh, h);
+                       (*mans[n->tok].post)(man, n, mh, h);

                break;
        }
 }
                break;
        }
 }


@@ -307,22 +311,21 @@ man_root_pre(MAN_ARGS)
        char             b[BUFSIZ], title[BUFSIZ];
 
        b[0] = 0;
        char             b[BUFSIZ], title[BUFSIZ];
 
        b[0] = 0;

-       if (m->vol)
-               (void)strlcat(b, m->vol, BUFSIZ);
+       if (man->vol)
+               (void)strlcat(b, man->vol, BUFSIZ);

 
 

-       snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
+       assert(man->title);
+       assert(man->msec);
+       snprintf(title, BUFSIZ - 1, "%s(%s)", man->title, man->msec);

 
        PAIR_SUMMARY_INIT(&tag[0], "Document Header");
        PAIR_CLASS_INIT(&tag[1], "head");
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Header");
        PAIR_CLASS_INIT(&tag[1], "head");

-       if (NULL == h->style) {
-               PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-               t = print_otag(h, TAG_TABLE, 3, tag);
-               PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
-               print_otag(h, TAG_COL, 1, tag);
-               print_otag(h, TAG_COL, 1, tag);
-               print_otag(h, TAG_COL, 1, tag);
-       } else
-               t = print_otag(h, TAG_TABLE, 2, tag);
+       PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+       t = print_otag(h, TAG_TABLE, 3, tag);
+       PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);

 
        print_otag(h, TAG_TBODY, 0, NULL);
 
 
        print_otag(h, TAG_TBODY, 0, NULL);
 


@@ -330,27 +333,18 @@ man_root_pre(MAN_ARGS)
 
        PAIR_CLASS_INIT(&tag[0], "head-ltitle");
        print_otag(h, TAG_TD, 1, tag);
 
        PAIR_CLASS_INIT(&tag[0], "head-ltitle");
        print_otag(h, TAG_TD, 1, tag);

-

        print_text(h, title);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-vol");
        print_text(h, title);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-vol");

-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
-
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
+       print_otag(h, TAG_TD, 2, tag);

        print_text(h, b);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");
        print_text(h, b);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");

-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
-
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+       print_otag(h, TAG_TD, 2, tag);

        print_text(h, title);
        print_tagq(h, t);
 }
        print_text(h, title);
        print_tagq(h, t);
 }


@@ -365,32 +359,27 @@ man_root_post(MAN_ARGS)
 
        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");

-       if (NULL == h->style) {
-               PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-               t = print_otag(h, TAG_TABLE, 3, tag);
-               PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
-               print_otag(h, TAG_COL, 1, tag);
-               print_otag(h, TAG_COL, 1, tag);
-       } else
-               t = print_otag(h, TAG_TABLE, 2, tag);
+       PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+       t = print_otag(h, TAG_TABLE, 3, tag);
+       PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);

 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        PAIR_CLASS_INIT(&tag[0], "foot-date");
        print_otag(h, TAG_TD, 1, tag);
 
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        PAIR_CLASS_INIT(&tag[0], "foot-date");
        print_otag(h, TAG_TD, 1, tag);
 

-       print_text(h, m->date);
+       assert(man->date);
+       print_text(h, man->date);

        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");

-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+       print_otag(h, TAG_TD, 2, tag);

 
 

-       if (m->source)
-               print_text(h, m->source);
+       if (man->source)
+               print_text(h, man->source);

        print_tagq(h, t);
 }
 
        print_tagq(h, t);
 }
 


@@ -486,7 +475,7 @@ man_alt_pre(MAN_ARGS)
                if (TAG_MAX != fp)
                        t = print_otag(h, fp, 0, NULL);
 
                if (TAG_MAX != fp)
                        t = print_otag(h, fp, 0, NULL);
 

-               print_man_node(m, nn, mh, h);
+               print_man_node(man, nn, mh, h);

 
                if (t)
                        print_tagq(h, t);
 
                if (t)
                        print_tagq(h, t);


@@ -561,14 +550,19 @@ man_IP_pre(MAN_ARGS)
        /* For IP, only print the first header element. */
 
        if (MAN_IP == n->tok && n->child)
        /* For IP, only print the first header element. */
 
        if (MAN_IP == n->tok && n->child)

-               print_man_node(m, n->child, mh, h);
+               print_man_node(man, n->child, mh, h);

 
        /* For TP, only print next-line header elements. */
 
 
        /* For TP, only print next-line header elements. */
 

-       if (MAN_TP == n->tok)
-               for (nn = n->child; nn; nn = nn->next)
-                       if (nn->line > n->line)
-                               print_man_node(m, nn, mh, h);
+       if (MAN_TP == n->tok) {
+               nn = n->child;
+               while (NULL != nn && 0 == (MAN_LINE & nn->flags))
+                       nn = nn->next;
+               while (NULL != nn) {
+                       print_man_node(man, nn, mh, h);
+                       nn = nn->next;
+               }
+       }

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


@@ -602,6 +596,37 @@ man_HP_pre(MAN_ARGS)
        return(1);
 }
 
        return(1);
 }
 

+/* ARGSUSED */
+static int
+man_OP_pre(MAN_ARGS)
+{
+       struct tag      *tt;
+       struct htmlpair  tag;
+
+       print_text(h, "[");
+       h->flags |= HTML_NOSPACE;
+       PAIR_CLASS_INIT(&tag, "opt");
+       tt = print_otag(h, TAG_SPAN, 1, &tag);
+
+       if (NULL != (n = n->child)) {
+               print_otag(h, TAG_B, 0, NULL);
+               print_text(h, n->string);
+       }
+
+       print_stagq(h, tt);
+
+       if (NULL != n && NULL != n->next) {
+               print_otag(h, TAG_I, 0, NULL);
+               print_text(h, n->next->string);
+       }
+
+       print_stagq(h, tt);
+       h->flags |= HTML_NOSPACE;
+       print_text(h, "]");
+       return(0);
+}
+
+

 /* ARGSUSED */
 static int
 man_B_pre(MAN_ARGS)
 /* ARGSUSED */
 static int
 man_B_pre(MAN_ARGS)


@@ -625,7 +650,7 @@ static int
 man_literal_pre(MAN_ARGS)
 {
 
 man_literal_pre(MAN_ARGS)
 {
 

-       if (MAN_nf != n->tok) {
+       if (MAN_fi == n->tok || MAN_EE == n->tok) {

                print_otag(h, TAG_BR, 0, NULL);
                mh->fl &= ~MANH_LITERAL;
        } else
                print_otag(h, TAG_BR, 0, NULL);
                mh->fl &= ~MANH_LITERAL;
        } else


@@ -673,3 +698,27 @@ man_RS_pre(MAN_ARGS)
        print_otag(h, TAG_DIV, 1, &tag);
        return(1);
 }
        print_otag(h, TAG_DIV, 1, &tag);
        return(1);
 }

+
+/* ARGSUSED */
+static int
+man_UR_pre(MAN_ARGS)
+{
+       struct htmlpair          tag[2];
+
+       n = n->child;
+       assert(MAN_HEAD == n->type);
+       if (n->nchild) {
+               assert(MAN_TEXT == n->child->type);
+               PAIR_CLASS_INIT(&tag[0], "link-ext");
+               PAIR_HREF_INIT(&tag[1], n->child->string);
+               print_otag(h, TAG_A, 2, tag);
+       }
+
+       assert(MAN_BODY == n->next->type);
+       if (n->next->nchild)
+               n = n->next;
+
+       print_man_nodelist(man, n->child, mh, h);
+
+       return(0);
+}