done: .de; todo: """"; loops in macro and string expansion

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 67431002017efa63117aa443fe876c97efe7c049..f6e8360ec4df4ac2bea87a892e43745ca34aff5e 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.44 2010/07/22 23:53:54 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.52 2010/12/08 10:58:22 kristaps Exp $ */

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


@@ -40,8 +40,14 @@
 
 #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, \

+                         struct mhtml *mh, \

                          struct html *h
 
                          struct html *h
 

+struct mhtml {
+       int               fl;
+#define        MANH_LITERAL     (1 << 0) /* literal context */
+};
+

 struct htmlman {
        int             (*pre)(MAN_ARGS);
        int             (*post)(MAN_ARGS);
 struct htmlman {
        int             (*pre)(MAN_ARGS);
        int             (*post)(MAN_ARGS);


@@ -58,6 +64,8 @@ static        int               a2width(const struct man_node *,
 static int               man_alt_pre(MAN_ARGS);
 static int               man_br_pre(MAN_ARGS);
 static int               man_ign_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 int               man_root_pre(MAN_ARGS);
 static int               man_B_pre(MAN_ARGS);
 static void              man_root_post(MAN_ARGS);
 static int               man_root_pre(MAN_ARGS);
 static int               man_B_pre(MAN_ARGS);


@@ -94,21 +102,17 @@ static     const struct htmlman mans[MAN_MAX] = {
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */
        { NULL, NULL }, /* na */
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */
        { NULL, NULL }, /* na */

-       { NULL, NULL }, /* i */

        { man_br_pre, NULL }, /* sp */
        { man_br_pre, NULL }, /* sp */

-       { NULL, NULL }, /* nf */
-       { NULL, NULL }, /* fi */
-       { NULL, NULL }, /* r */
+       { man_literal_pre, NULL }, /* nf */
+       { man_literal_pre, NULL }, /* fi */

        { NULL, NULL }, /* RE */
        { man_RS_pre, NULL }, /* RS */
        { man_ign_pre, NULL }, /* DT */
        { man_ign_pre, NULL }, /* UC */
        { man_ign_pre, NULL }, /* PD */
        { NULL, NULL }, /* RE */
        { man_RS_pre, NULL }, /* RS */
        { 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 */

        { man_ign_pre, NULL }, /* AT */
        { man_ign_pre, NULL }, /* AT */

-       { NULL, NULL }, /* in */
+       { man_in_pre, NULL }, /* in */
+       { man_ign_pre, NULL }, /* ft */

 };
 
 
 };
 
 


@@ -117,13 +121,16 @@ html_man(void *arg, const struct man *m)
 {
        struct html     *h;
        struct tag      *t;
 {
        struct html     *h;
        struct tag      *t;

+       struct mhtml     mh;

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

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

        t = print_otag(h, TAG_HTML, 0, NULL);
        t = print_otag(h, TAG_HTML, 0, NULL);

-       print_man(man_meta(m), man_node(m), h);
+       print_man(man_meta(m), man_node(m), &mh, h);

        print_tagq(h, t);
 
        printf("\n");
        print_tagq(h, t);
 
        printf("\n");


@@ -138,7 +145,7 @@ print_man(MAN_ARGS)
 
        t = print_otag(h, TAG_HEAD, 0, NULL);
 
 
        t = print_otag(h, TAG_HEAD, 0, NULL);
 

-       print_man_head(m, n, h);
+       print_man_head(m, n, mh, h);

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


@@ -146,7 +153,7 @@ print_man(MAN_ARGS)
        tag.val = "body";
        print_otag(h, TAG_DIV, 1, &tag);
 
        tag.val = "body";
        print_otag(h, TAG_DIV, 1, &tag);
 

-       print_man_nodelist(m, n, h);
+       print_man_nodelist(m, n, mh, h);

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


@@ -170,9 +177,9 @@ static void
 print_man_nodelist(MAN_ARGS)
 {
 
 print_man_nodelist(MAN_ARGS)
 {
 

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

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

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

 }
 
 
 }
 
 


@@ -195,10 +202,14 @@ print_man_node(MAN_ARGS)
 
        switch (n->type) {
        case (MAN_ROOT):
 
        switch (n->type) {
        case (MAN_ROOT):

-               child = man_root_pre(m, n, h);
+               child = man_root_pre(m, n, mh, h);

                break;
        case (MAN_TEXT):
                print_text(h, n->string);
                break;
        case (MAN_TEXT):
                print_text(h, n->string);

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

                return;
        default:
                /* 
                return;
        default:
                /* 


@@ -213,12 +224,12 @@ 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, h);
+                       child = (*mans[n->tok].pre)(m, n, mh, h);

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

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

 
        /* This will automatically close out any font scope. */
        print_stagq(h, t);
 
        /* This will automatically close out any font scope. */
        print_stagq(h, t);


@@ -227,13 +238,13 @@ print_man_node(MAN_ARGS)
 
        switch (n->type) {
        case (MAN_ROOT):
 
        switch (n->type) {
        case (MAN_ROOT):

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

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

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

                break;
        }
 }
                break;
        }
 }


@@ -350,18 +361,11 @@ man_br_pre(MAN_ARGS)
 
        SCALE_VS_INIT(&su, 1);
 
 
        SCALE_VS_INIT(&su, 1);
 

-       switch (n->tok) {
-       case (MAN_Sp):
-               SCALE_VS_INIT(&su, 0.5);
-               break;
-       case (MAN_sp):
+       if (MAN_sp == n->tok) {

                if (n->child)
                        a2roffsu(n->child->string, &su, SCALE_VS);
                if (n->child)
                        a2roffsu(n->child->string, &su, SCALE_VS);

-               break;
-       default:
+       } else

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

-               break;
-       }

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


@@ -454,7 +458,7 @@ man_alt_pre(MAN_ARGS)
                 * closed out with the scope.
                 */
                t = print_ofont(h, fp);
                 * closed out with the scope.
                 */
                t = print_ofont(h, fp);

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

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


@@ -538,8 +542,10 @@ man_PP_pre(MAN_ARGS)
        struct roffsu    su;
        int              i;
 
        struct roffsu    su;
        int              i;
 

-       if (MAN_BLOCK != n->type)
+       if (MAN_BODY == n->type)

                return(1);
                return(1);

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

 
        i = 0;
 
 
        i = 0;
 


@@ -556,6 +562,7 @@ man_PP_pre(MAN_ARGS)
 
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, i, &tag);
 
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, i, &tag);

+

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


@@ -648,10 +655,10 @@ man_IP_pre(MAN_ARGS)
 
        if (MAN_IP == n->tok)
                for (nn = n->child; nn->next; nn = nn->next)
 
        if (MAN_IP == n->tok)
                for (nn = n->child; nn->next; nn = nn->next)

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

        if (MAN_TP == n->tok)
                for (nn = n->child->next; nn; nn = nn->next)
        if (MAN_TP == n->tok)
                for (nn = n->child->next; nn; nn = nn->next)

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

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


@@ -716,6 +723,31 @@ man_I_pre(MAN_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static int
+man_literal_pre(MAN_ARGS)
+{
+
+       if (MAN_nf == n->tok) {
+               print_otag(h, TAG_BR, 0, NULL);
+               mh->fl |= MANH_LITERAL;
+       } else
+               mh->fl &= ~MANH_LITERAL;
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+man_in_pre(MAN_ARGS)
+{
+
+       print_otag(h, TAG_BR, 0, NULL);
+       return(0);
+}
+
+

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