Remove asciisz from chars.in. It frees up a nice chunk of memory and at

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index b383987070b28efe34465ccdcd6429765ddee6e7..f109bd69d6774d999bdd20016a8b34997698856a 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_html.c,v 1.91 2010/07/02 10:42:46 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.99 2010/07/23 00:08:57 kristaps Exp $ */

 /*
 /*

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

  *
  * 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


@@ -30,7 +30,6 @@
 #include "mandoc.h"
 #include "out.h"
 #include "html.h"
 #include "mandoc.h"
 #include "out.h"
 #include "html.h"

-#include "regs.h"

 #include "mdoc.h"
 #include "main.h"
 
 #include "mdoc.h"
 #include "main.h"
 


@@ -73,6 +72,8 @@ static        int               mdoc_aq_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
 static int               mdoc_bf_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
 static int               mdoc_bf_pre(MDOC_ARGS);

+static void              mdoc_bk_post(MDOC_ARGS);
+static int               mdoc_bk_pre(MDOC_ARGS);

 static void              mdoc_bl_post(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static void              mdoc_bq_post(MDOC_ARGS);
 static void              mdoc_bl_post(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static void              mdoc_bq_post(MDOC_ARGS);


@@ -124,6 +125,7 @@ static      int               mdoc_pq_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
 static int               mdoc_rv_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
 static int               mdoc_rv_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);

+static int               mdoc_sm_pre(MDOC_ARGS);

 static int               mdoc_sp_pre(MDOC_ARGS);
 static void              mdoc_sq_post(MDOC_ARGS);
 static int               mdoc_sq_pre(MDOC_ARGS);
 static int               mdoc_sp_pre(MDOC_ARGS);
 static void              mdoc_sq_post(MDOC_ARGS);
 static int               mdoc_sq_pre(MDOC_ARGS);


@@ -208,7 +210,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */

-       {mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
+       {mdoc_ms_pre, NULL}, /* Ms */

        {NULL, NULL}, /* No */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
        {NULL, NULL}, /* No */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */


@@ -226,7 +228,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Sc */
        {mdoc_sq_pre, mdoc_sq_post}, /* So */
        {mdoc_sq_pre, mdoc_sq_post}, /* Sq */
        {NULL, NULL}, /* Sc */
        {mdoc_sq_pre, mdoc_sq_post}, /* So */
        {mdoc_sq_pre, mdoc_sq_post}, /* Sq */

-       {NULL, NULL}, /* Sm */ /* FIXME - no idea. */
+       {mdoc_sm_pre, NULL}, /* Sm */ 

        {mdoc_sx_pre, NULL}, /* Sx */
        {mdoc_sy_pre, NULL}, /* Sy */
        {NULL, NULL}, /* Tn */
        {mdoc_sx_pre, NULL}, /* Sx */
        {mdoc_sy_pre, NULL}, /* Sy */
        {NULL, NULL}, /* Tn */


@@ -237,7 +239,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Fc */ 
        {mdoc_op_pre, mdoc_op_post}, /* Oo */
        {NULL, NULL}, /* Oc */
        {NULL, NULL}, /* Fc */ 
        {mdoc_op_pre, mdoc_op_post}, /* Oo */
        {NULL, NULL}, /* Oc */

-       {NULL, NULL}, /* Bk */
+       {mdoc_bk_pre, mdoc_bk_post}, /* Bk */

        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */


@@ -442,6 +444,18 @@ print_mdoc_node(MDOC_ARGS)
                break;
        }
 
                break;
        }
 

+       if (HTML_KEEP & h->flags) {
+               if (n->prev && n->prev->line != n->line) {
+                       h->flags &= ~HTML_KEEP;
+                       h->flags |= HTML_PREKEEP;
+               } else if (NULL == n->prev) {
+                       if (n->parent && n->parent->line != n->line) {
+                               h->flags &= ~HTML_KEEP;
+                               h->flags |= HTML_PREKEEP;
+                       }
+               }
+       }
+

        if (child && n->child)
                print_mdoc_nodelist(m, n->child, h);
 
        if (child && n->child)
                print_mdoc_nodelist(m, n->child, h);
 


@@ -1074,7 +1088,7 @@ mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)
 static int
 mdoc_it_pre(MDOC_ARGS)
 {
 static int
 mdoc_it_pre(MDOC_ARGS)
 {

-       int                      i, wp, comp;
+       int                      i, comp;

        const struct mdoc_node  *bl, *nn;
        struct roffsu            width, offs;
        enum mdoc_list           type;
        const struct mdoc_node  *bl, *nn;
        struct roffsu            width, offs;
        enum mdoc_list           type;


@@ -1116,16 +1130,6 @@ mdoc_it_pre(MDOC_ARGS)
        if (bl->data.Bl->width)
                a2width(bl->data.Bl->width, &width);
 
        if (bl->data.Bl->width)
                a2width(bl->data.Bl->width, &width);
 

-       wp = -1;
-       for (i = 0; bl->args && i < (int)bl->args->argc; i++) 
-               switch (bl->args->argv[i].arg) {
-               case (MDOC_Column):
-                       wp = i; /* Save for later. */
-                       break;
-               default:
-                       break;
-               }
-

        /* Override width in some cases. */
 
        switch (type) {
        /* Override width in some cases. */
 
        switch (type) {


@@ -1149,8 +1153,8 @@ mdoc_it_pre(MDOC_ARGS)
                for (i = 0; nn && nn != n; nn = nn->next)
                        if (MDOC_BODY == nn->type)
                                i++;
                for (i = 0; nn && nn != n; nn = nn->next)
                        if (MDOC_BODY == nn->type)
                                i++;

-               if (i < (int)bl->args->argv[wp].sz)
-                       a2width(bl->args->argv[wp].value[i], &width);
+               if (i < (int)bl->data.Bl->ncols)
+                       a2width(bl->data.Bl->cols[i], &width);

        }
 
        if (MDOC_HEAD == n->type)
        }
 
        if (MDOC_HEAD == n->type)


@@ -1717,6 +1721,23 @@ mdoc_fn_pre(MDOC_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static int
+mdoc_sm_pre(MDOC_ARGS)
+{
+
+       assert(n->child && MDOC_TEXT == n->child->type);
+       if (0 == strcmp("on", n->child->string)) {
+               /* FIXME: no p->col to check... */
+               h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONOSPACE;
+       } else
+               h->flags |= HTML_NONOSPACE;
+
+       return(0);
+}
+
+

 /* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)
 /* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)


@@ -1734,6 +1755,11 @@ mdoc_sp_pre(MDOC_ARGS)
                len = 0;
                break;
        default:
                len = 0;
                break;
        default:

+               assert(n->parent);
+               if ((NULL == n->next || NULL == n->prev) &&
+                               (MDOC_Ss == n->parent->tok ||
+                                MDOC_Sh == n->parent->tok))
+                       return(0);

                len = 1;
                break;
        }
                len = 1;
                break;
        }


@@ -2015,46 +2041,33 @@ mdoc_ap_pre(MDOC_ARGS)
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {

-       int              i;

        struct htmlpair  tag[2];
        struct roffsu    su;
 
        if (MDOC_HEAD == n->type)
                return(0);
        struct htmlpair  tag[2];
        struct roffsu    su;
 
        if (MDOC_HEAD == n->type)
                return(0);

-       else if (MDOC_BLOCK != n->type)
+       else if (MDOC_BODY != n->type)

                return(1);
 
                return(1);
 

-       PAIR_CLASS_INIT(&tag[0], "lit");
-
-       if (n->head->child) {
-               if ( ! strcmp("Em", n->head->child->string))
-                       PAIR_CLASS_INIT(&tag[0], "emph");
-               else if ( ! strcmp("Sy", n->head->child->string))
-                       PAIR_CLASS_INIT(&tag[0], "symb");
-               else if ( ! strcmp("Li", n->head->child->string))
-                       PAIR_CLASS_INIT(&tag[0], "lit");
-       } else {
-               for (i = 0; n->args && i < (int)n->args->argc; i++) 
-                       switch (n->args->argv[i].arg) {
-                       case (MDOC_Symbolic):
-                               PAIR_CLASS_INIT(&tag[0], "symb");
-                               break;
-                       case (MDOC_Literal):
-                               PAIR_CLASS_INIT(&tag[0], "lit");
-                               break;
-                       case (MDOC_Emphasis):
-                               PAIR_CLASS_INIT(&tag[0], "emph");
-                               break;
-                       default:
-                               break;
-                       }
-       }
+       assert(n->data.Bf);

 
 

-       /* FIXME: div's have spaces stripped--we want them. */
+       if (FONT_Em == n->data.Bf->font) 
+               PAIR_CLASS_INIT(&tag[0], "emph");
+       else if (FONT_Sy == n->data.Bf->font) 
+               PAIR_CLASS_INIT(&tag[0], "symb");
+       else if (FONT_Li == n->data.Bf->font) 
+               PAIR_CLASS_INIT(&tag[0], "lit");
+       else
+               PAIR_CLASS_INIT(&tag[0], "none");

 
 

+       /* 
+        * We want this to be inline-formatted, but needs to be div to
+        * accept block children. 
+        */

        bufcat_style(h, "display", "inline");
        SCALE_HS_INIT(&su, 1);
        bufcat_style(h, "display", "inline");
        SCALE_HS_INIT(&su, 1);

-       bufcat_su(h, "margin-right", &su);
+       /* Needs a left-margin for spacing. */
+       bufcat_su(h, "margin-left", &su);

        PAIR_STYLE_INIT(&tag[1], h);
        print_otag(h, TAG_DIV, 2, tag);
        return(1);
        PAIR_STYLE_INIT(&tag[1], h);
        print_otag(h, TAG_DIV, 2, tag);
        return(1);


@@ -2250,3 +2263,35 @@ mdoc__x_post(MDOC_ARGS)
        h->flags |= HTML_NOSPACE;
        print_text(h, n->next ? "," : ".");
 }
        h->flags |= HTML_NOSPACE;
        print_text(h, n->next ? "," : ".");
 }

+
+
+/* ARGSUSED */
+static int
+mdoc_bk_pre(MDOC_ARGS)
+{
+
+       switch (n->type) {
+       case (MDOC_BLOCK):
+               break;
+       case (MDOC_HEAD):
+               return(0);
+       case (MDOC_BODY):
+               h->flags |= HTML_PREKEEP;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+       if (MDOC_BODY == n->type)
+               h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
+}