Fix parsing of file names given on the command line; i broke it

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 2c79a8f00adaad996451bd48e18aee88d651ddee..fce1d4c529e1fe5ae55d6c9cc8c49496fe4651e1 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.77 2011/07/07 13:26:25 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.85 2011/12/04 00:44:12 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -36,7 +36,6 @@
 /* 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, \
                          const struct man_node *n, \
 
 #define        MAN_ARGS          const struct man_meta *m, \
                          const struct man_node *n, \


@@ -142,33 +141,32 @@ print_bvspace(struct html *h, const struct man_node *n)
 void
 html_man(void *arg, const struct man *m)
 {
 void
 html_man(void *arg, const struct man *m)
 {

-       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(m), man_node(m), &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");
+
+       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(m, 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);

 
 

-       t = print_otag(h, TAG_BODY, 0, NULL);

        print_man_nodelist(m, n, mh, h);
        print_tagq(h, t);
 }
        print_man_nodelist(m, n, mh, h);
        print_tagq(h, t);
 }


@@ -180,6 +178,8 @@ print_man_head(MAN_ARGS)
 {
 
        print_gen_head(h);
 {
 
        print_gen_head(h);

+       assert(m->title);
+       assert(m->msec);

        bufcat_fmt(h, "%s(%s)", m->title, m->msec);
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);
        bufcat_fmt(h, "%s(%s)", m->title, m->msec);
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);


@@ -201,7 +201,6 @@ print_man_node(MAN_ARGS)
 {
        int              child;
        struct tag      *t;
 {
        int              child;
        struct tag      *t;

-       struct htmlpair  tag;

 
        child = 1;
        t = h->tags.head;
 
        child = 1;
        t = h->tags.head;


@@ -219,27 +218,17 @@ print_man_node(MAN_ARGS)
                if ('\0' == *n->string) {
                        print_otag(h, TAG_P, 0, NULL);
                        return;
                if ('\0' == *n->string) {
                        print_otag(h, TAG_P, 0, NULL);
                        return;

-               } else if (' ' == *n->string && MAN_LINE & n->flags)
+               }
+
+               if (' ' == *n->string && MAN_LINE & n->flags)
+                       print_otag(h, TAG_BR, 0, NULL);
+               else if (MANH_LITERAL & mh->fl && n->prev)

                        print_otag(h, TAG_BR, 0, NULL);
 
                print_text(h, n->string);
                        print_otag(h, TAG_BR, 0, NULL);
 
                print_text(h, n->string);

-
-               /*
-                * If we're in a literal context, make sure that words
-                * togehter on the same line stay together.  This is a
-                * POST-printing call, so we check the NEXT word.  Since
-                * -man doesn't have nested macros, we don't need to be
-                * more specific than this.
-                */
-               if (MANH_LITERAL & mh->fl &&
-                               (NULL == n->next ||
-                                n->next->line > n->line))
-                       print_otag(h, TAG_BR, 0, NULL);

                return;
        case (MAN_EQN):
                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):
                /*


@@ -318,19 +307,18 @@ man_root_pre(MAN_ARGS)
        if (m->vol)
                (void)strlcat(b, m->vol, BUFSIZ);
 
        if (m->vol)
                (void)strlcat(b, m->vol, BUFSIZ);
 

+       assert(m->title);
+       assert(m->msec);

        snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Header");
        PAIR_CLASS_INIT(&tag[1], "head");
        snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
 
        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);
 


@@ -338,27 +326,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);
 }


@@ -373,29 +352,24 @@ 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);
 

+       assert(m->date);

        print_text(h, m->date);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");
        print_text(h, m->date);
        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 (m->source)
                print_text(h, m->source);


@@ -453,10 +427,15 @@ static int
 man_alt_pre(MAN_ARGS)
 {
        const struct man_node   *nn;
 man_alt_pre(MAN_ARGS)
 {
        const struct man_node   *nn;

-       int              i;
+       int              i, savelit;

        enum htmltag     fp;
        struct tag      *t;
 
        enum htmltag     fp;
        struct tag      *t;
 

+       if ((savelit = mh->fl & MANH_LITERAL)) 
+               print_otag(h, TAG_BR, 0, NULL);
+
+       mh->fl &= ~MANH_LITERAL;
+

        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                t = NULL;
                switch (n->tok) {
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                t = NULL;
                switch (n->tok) {


@@ -495,6 +474,9 @@ man_alt_pre(MAN_ARGS)
                        print_tagq(h, t);
        }
 
                        print_tagq(h, t);
        }
 

+       if (savelit)
+               mh->fl |= MANH_LITERAL;
+

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


@@ -554,6 +536,8 @@ man_IP_pre(MAN_ARGS)
                return(1);
        }
 
                return(1);
        }
 

+       /* FIXME: width specification. */
+

        print_otag(h, TAG_DT, 0, NULL);
 
        /* For IP, only print the first header element. */
        print_otag(h, TAG_DT, 0, NULL);
 
        /* For IP, only print the first header element. */


@@ -623,11 +607,11 @@ static int
 man_literal_pre(MAN_ARGS)
 {
 
 man_literal_pre(MAN_ARGS)
 {
 

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

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

-               mh->fl |= MANH_LITERAL;
-       } else

                mh->fl &= ~MANH_LITERAL;
                mh->fl &= ~MANH_LITERAL;

+       } else
+               mh->fl |= MANH_LITERAL;

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