Remove `am', `ami', `de', `dei', and `.' from -man, as they're now in the roff prepro...

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 8402ec37fe4d1f6e537a25155f7c00f7bd83a941..3a6be4a98f26f8ecd7cd3d1d187b9b8daaa2ddf7 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.16 2009/10/28 08:00:18 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.33 2010/05/15 22:44:04 kristaps Exp $ */

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


@@ -14,11 +14,14 @@
  * 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 <assert.h>
 #include <ctype.h>
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -67,11 +70,6 @@ static       int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);
 
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_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 htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */
        { NULL, NULL }, /* TH */
 static const struct htmlman mans[MAN_MAX] = {
        { man_br_pre, NULL }, /* br */
        { NULL, NULL }, /* TH */


@@ -105,6 +103,9 @@ static      const struct htmlman mans[MAN_MAX] = {
        { man_ign_pre, NULL }, /* DT */
        { man_ign_pre, NULL }, /* UC */
        { man_ign_pre, NULL }, /* PD */
        { man_ign_pre, NULL }, /* DT */
        { man_ign_pre, NULL }, /* UC */
        { man_ign_pre, NULL }, /* PD */

+       { man_br_pre, NULL }, /* Sp */
+       { man_ign_pre, NULL }, /* Vb */
+       { NULL, NULL }, /* Ve */

 };
 
 
 };
 
 


@@ -116,7 +117,7 @@ html_man(void *arg, const struct man *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_man(man_meta(m), man_node(m), h);
 
        t = print_otag(h, TAG_HTML, 0, NULL);
        print_man(man_meta(m), man_node(m), h);


@@ -155,7 +156,7 @@ print_man_head(MAN_ARGS)
 
        print_gen_head(h);
        bufinit(h);
 
        print_gen_head(h);
        bufinit(h);

-       buffmt(h, "%s(%d)", m->title, m->msec);
+       buffmt(h, "%s(%s)", m->title, m->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);


@@ -183,14 +184,31 @@ print_man_node(MAN_ARGS)
 
        bufinit(h);
 
 
        bufinit(h);
 

+       /*
+        * FIXME: embedded elements within next-line scopes (e.g., `br'
+        * within an empty `B') will cause formatting to be forgotten
+        * due to scope closing out.
+        */
+

        switch (n->type) {
        case (MAN_ROOT):
                child = man_root_pre(m, n, h);
                break;
        case (MAN_TEXT):
                print_text(h, n->string);
        switch (n->type) {
        case (MAN_ROOT):
                child = man_root_pre(m, n, h);
                break;
        case (MAN_TEXT):
                print_text(h, n->string);

-               break;
+               return;

        default:
        default:

+               /* 
+                * Close out scope of font prior to opening a macro
+                * scope.  Assert that the metafont is on the top of the
+                * stack (it's never nested).
+                */
+               if (h->metaf) {
+                       assert(h->metaf == t);
+                       print_tagq(h, h->metaf);
+                       assert(NULL == h->metaf);
+                       t = h->tags.head;
+               }

                if (mans[n->tok].pre)
                        child = (*mans[n->tok].pre)(m, n, h);
                break;
                if (mans[n->tok].pre)
                        child = (*mans[n->tok].pre)(m, n, h);
                break;


@@ -199,6 +217,7 @@ print_man_node(MAN_ARGS)
        if (child && n->child)
                print_man_nodelist(m, n->child, h);
 
        if (child && n->child)
                print_man_nodelist(m, n->child, h);
 

+       /* This will automatically close out any font scope. */

        print_stagq(h, t);
 
        bufinit(h);
        print_stagq(h, t);
 
        bufinit(h);


@@ -242,8 +261,7 @@ man_root_pre(MAN_ARGS)
        if (m->vol)
                (void)strlcat(b, m->vol, BUFSIZ);
 
        if (m->vol)
                (void)strlcat(b, m->vol, BUFSIZ);
 

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

 
        PAIR_CLASS_INIT(&tag[0], "header");
        bufcat_style(h, "width", "100%");
 
        PAIR_CLASS_INIT(&tag[0], "header");
        bufcat_style(h, "width", "100%");


@@ -326,14 +344,23 @@ man_br_pre(MAN_ARGS)
 
        SCALE_VS_INIT(&su, 1);
 
 
        SCALE_VS_INIT(&su, 1);
 

-       if (MAN_sp == n->tok && n->child)
-               a2roffsu(n->child->string, &su, SCALE_VS);
-       else if (MAN_br == n->tok)
+       switch (n->tok) {
+       case (MAN_Sp):
+               SCALE_VS_INIT(&su, 0.5);
+               break;
+       case (MAN_sp):
+               if (n->child)
+                       a2roffsu(n->child->string, &su, SCALE_VS);
+               break;
+       default:

                su.scale = 0;
                su.scale = 0;

+               break;
+       }

 
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
 
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);

+

        /* So the div isn't empty: */
        print_text(h, "\\~");
 
        /* So the div isn't empty: */
        print_text(h, "\\~");
 


@@ -385,30 +412,27 @@ man_alt_pre(MAN_ARGS)
        const struct man_node   *nn;
        struct tag              *t;
        int                      i;
        const struct man_node   *nn;
        struct tag              *t;
        int                      i;

-       struct htmlpair          tagi, tagb, *tagp;
-
-       PAIR_CLASS_INIT(&tagi, "italic");
-       PAIR_CLASS_INIT(&tagb, "bold");
+       enum htmlfont            fp;

 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                switch (n->tok) {
                case (MAN_BI):
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                switch (n->tok) {
                case (MAN_BI):

-                       tagp = i % 2 ? &tagi : &tagb;
+                       fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD;

                        break;
                case (MAN_IB):
                        break;
                case (MAN_IB):

-                       tagp = i % 2 ? &tagb : &tagi;
+                       fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC;

                        break;
                case (MAN_RI):
                        break;
                case (MAN_RI):

-                       tagp = i % 2 ? &tagi : NULL;
+                       fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE;

                        break;
                case (MAN_IR):
                        break;
                case (MAN_IR):

-                       tagp = i % 2 ? NULL : &tagi;
+                       fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC;

                        break;
                case (MAN_BR):
                        break;
                case (MAN_BR):

-                       tagp = i % 2 ? NULL : &tagb;
+                       fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD;

                        break;
                case (MAN_RB):
                        break;
                case (MAN_RB):

-                       tagp = i % 2 ? &tagb : NULL;
+                       fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE;

                        break;
                default:
                        abort();
                        break;
                default:
                        abort();


@@ -418,12 +442,14 @@ man_alt_pre(MAN_ARGS)
                if (i)
                        h->flags |= HTML_NOSPACE;
 
                if (i)
                        h->flags |= HTML_NOSPACE;
 

-               if (tagp) {
-                       t = print_otag(h, TAG_SPAN, 1, tagp);
-                       print_man_node(m, nn, h);
-                       print_tagq(h, t);
-               } else
-                       print_man_node(m, nn, h);
+               /* 
+                * Open and close the scope with each argument, so that
+                * internal \f escapes, which are common, are also
+                * closed out with the scope.
+                */
+               t = print_ofont(h, fp);
+               print_man_node(m, nn, h);
+               print_tagq(h, t);

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


@@ -436,6 +462,7 @@ man_SB_pre(MAN_ARGS)
 {
        struct htmlpair  tag;
        
 {
        struct htmlpair  tag;
        

+       /* FIXME: print_ofont(). */

        PAIR_CLASS_INIT(&tag, "small bold");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
        PAIR_CLASS_INIT(&tag, "small bold");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);


@@ -510,19 +537,19 @@ man_PP_pre(MAN_ARGS)
 
        i = 0;
 
 
        i = 0;
 

-       if (MAN_ROOT == n->parent->tok) {
+       if (MAN_ROOT == n->parent->type) {

                SCALE_HS_INIT(&su, INDENT);
                bufcat_su(h, "margin-left", &su);
                SCALE_HS_INIT(&su, INDENT);
                bufcat_su(h, "margin-left", &su);

-               i++;
+               i = 1;

        }
        }

-       if (n->next && n->next->child) {
+       if (n->prev) {

                SCALE_VS_INIT(&su, 1);
                SCALE_VS_INIT(&su, 1);

-               bufcat_su(h, "margin-bottom", &su);
-               i++;
+               bufcat_su(h, "margin-top", &su);
+               i = 1;

        }
 
        PAIR_STYLE_INIT(&tag, h);
        }
 
        PAIR_STYLE_INIT(&tag, h);

-       print_otag(h, TAG_DIV, i ? 1 : 0, &tag);
+       print_otag(h, TAG_DIV, i, &tag);

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


@@ -557,6 +584,8 @@ man_IP_pre(MAN_ARGS)
        SCALE_HS_INIT(&su, INDENT);
        width = 0;
 
        SCALE_HS_INIT(&su, INDENT);
        width = 0;
 

+       /* Width is the last token. */
+

        if (MAN_IP == n->tok && NULL != nn)
                if (NULL != (nn = nn->next)) {
                        for ( ; nn->next; nn = nn->next)
        if (MAN_IP == n->tok && NULL != nn)
                if (NULL != (nn = nn->next)) {
                        for ( ; nn->next; nn = nn->next)


@@ -564,8 +593,15 @@ man_IP_pre(MAN_ARGS)
                        width = a2width(nn, &su);
                }
 
                        width = a2width(nn, &su);
                }
 

-       if (MAN_TP == n->tok && NULL != nn)
-               width = a2width(nn, &su);
+       /* Width is the first token. */
+
+       if (MAN_TP == n->tok && NULL != nn) {
+               /* Skip past non-text children. */
+               while (nn && MAN_TEXT != nn->type)
+                       nn = nn->next;
+               if (nn)
+                       width = a2width(nn, &su);
+       }

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


@@ -590,11 +626,20 @@ man_IP_pre(MAN_ARGS)
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
 
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
 

-       /* With a length string, manually omit the last child. */
+       /*
+        * Without a length string, we can print all of our children.
+        */

 
        if ( ! width)
                return(1);
 
 
        if ( ! width)
                return(1);
 

+       /*
+        * When a length has been specified, we need to carefully print
+        * our child context:  IP gets all children printed but the last
+        * (the width), while TP gets all children printed but the first
+        * (the width).
+        */
+

        if (MAN_IP == n->tok)
                for (nn = n->child; nn->next; nn = nn->next)
                        print_man_node(m, nn, h);
        if (MAN_IP == n->tok)
                for (nn = n->child; nn->next; nn = nn->next)
                        print_man_node(m, nn, h);


@@ -649,10 +694,8 @@ man_HP_pre(MAN_ARGS)
 static int
 man_B_pre(MAN_ARGS)
 {
 static int
 man_B_pre(MAN_ARGS)
 {

-       struct htmlpair  tag;

 
 

-       PAIR_CLASS_INIT(&tag, "bold");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_ofont(h, HTMLFONT_BOLD);

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


@@ -661,10 +704,8 @@ man_B_pre(MAN_ARGS)
 static int
 man_I_pre(MAN_ARGS)
 {
 static int
 man_I_pre(MAN_ARGS)
 {

-       struct htmlpair  tag;
-
-       PAIR_CLASS_INIT(&tag, "italic");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       
+       print_ofont(h, HTMLFONT_ITALIC);

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