]> git.cameronkatri.com Git - mandoc.git/blobdiff - mdoc_html.c
test inter-column spacing
[mandoc.git] / mdoc_html.c
index d8c8693643deedc5211fada9ec814de9d45dd010..f2d97f3ee56e839b8e2d23d2bbaad9c2194ee0d4 100644 (file)
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.279 2017/04/17 12:53:29 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.291 2017/06/24 14:38:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -27,6 +27,7 @@
 #include <unistd.h>
 
 #include "mandoc_aux.h"
+#include "mandoc.h"
 #include "roff.h"
 #include "mdoc.h"
 #include "out.h"
@@ -108,7 +109,6 @@ static      int               mdoc_rs_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);
 static int               mdoc_skip_pre(MDOC_ARGS);
 static int               mdoc_sm_pre(MDOC_ARGS);
-static int               mdoc_sp_pre(MDOC_ARGS);
 static int               mdoc_ss_pre(MDOC_ARGS);
 static int               mdoc_st_pre(MDOC_ARGS);
 static int               mdoc_sx_pre(MDOC_ARGS);
@@ -118,8 +118,7 @@ static      int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 
-static const struct htmlmdoc mdocs[MDOC_MAX] = {
-       {mdoc_ap_pre, NULL}, /* Ap */
+static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = {
        {NULL, NULL}, /* Dd */
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */
@@ -135,6 +134,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_it_pre, NULL}, /* It */
        {mdoc_ad_pre, NULL}, /* Ad */
        {mdoc_an_pre, NULL}, /* An */
+       {mdoc_ap_pre, NULL}, /* Ap */
        {mdoc_ar_pre, NULL}, /* Ar */
        {mdoc_cd_pre, NULL}, /* Cd */
        {mdoc_cm_pre, NULL}, /* Cm */
@@ -237,12 +237,10 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_quote_pre, mdoc_quote_post}, /* En */
        {mdoc_xx_pre, NULL}, /* Dx */
        {mdoc__x_pre, mdoc__x_post}, /* %Q */
-       {mdoc_sp_pre, NULL}, /* br */
-       {mdoc_sp_pre, NULL}, /* sp */
        {mdoc__x_pre, mdoc__x_post}, /* %U */
        {NULL, NULL}, /* Ta */
-       {mdoc_skip_pre, NULL}, /* ll */
 };
+static const struct htmlmdoc *const mdocs = __mdocs - MDOC_Dd;
 
 
 /*
@@ -362,9 +360,9 @@ print_mdoc_node(MDOC_ARGS)
                 * Make sure that if we're in a literal mode already
                 * (i.e., within a <PRE>) don't print the newline.
                 */
-               if (' ' == *n->string && NODE_LINE & n->flags)
-                       if ( ! (HTML_LITERAL & h->flags))
-                               print_otag(h, TAG_BR, "");
+               if (*n->string == ' ' && n->flags & NODE_LINE &&
+                   (h->flags & (HTML_LITERAL | HTML_NONEWLINE)) == 0)
+                       print_otag(h, TAG_BR, "");
                if (NODE_DELIMC & n->flags)
                        h->flags |= HTML_NOSPACE;
                print_text(h, n->string);
@@ -393,7 +391,14 @@ print_mdoc_node(MDOC_ARGS)
                        t = h->tag;
                }
                assert(h->tblt == NULL);
-               if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))
+               if (n->tok < ROFF_MAX) {
+                       roff_html_pre(h, n);
+                       child = 0;
+                       break;
+               }
+               assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
+               if (mdocs[n->tok].pre != NULL &&
+                   (n->end == ENDBODY_NOT || n->child != NULL))
                        child = (*mdocs[n->tok].pre)(meta, n, h);
                break;
        }
@@ -412,7 +417,9 @@ print_mdoc_node(MDOC_ARGS)
        case ROFFT_EQN:
                break;
        default:
-               if ( ! mdocs[n->tok].post || n->flags & NODE_ENDED)
+               if (n->tok < ROFF_MAX ||
+                   mdocs[n->tok].post == NULL ||
+                   n->flags & NODE_ENDED)
                        break;
                (*mdocs[n->tok].post)(meta, n, h);
                if (n->end != ENDBODY_NOT)
@@ -579,9 +586,6 @@ mdoc_nd_pre(MDOC_ARGS)
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
-       struct tag      *t;
-       int              len;
-
        switch (n->type) {
        case ROFFT_HEAD:
                print_otag(h, TAG_TD, "");
@@ -595,22 +599,8 @@ mdoc_nm_pre(MDOC_ARGS)
        default:
                break;
        }
-
        synopsis_pre(h, n);
        print_otag(h, TAG_TABLE, "c", "Nm");
-
-       for (len = 0, n = n->head->child; n; n = n->next)
-               if (n->type == ROFFT_TEXT)
-                       len += html_strlen(n->string);
-
-       if (len == 0 && meta->name != NULL)
-               len = html_strlen(meta->name);
-
-       t = print_otag(h, TAG_COLGROUP, "");
-       /* Increase width to make even bold text fit. */
-       print_otag(h, TAG_COL, "shw", len + 2);
-       print_otag(h, TAG_COL, "");
-       print_tagq(h, t);
        print_otag(h, TAG_TR, "");
        return 1;
 }
@@ -762,7 +752,7 @@ mdoc_it_pre(MDOC_ARGS)
                            (n->parent->prev == NULL ||
                             n->parent->prev->body == NULL ||
                             n->parent->prev->body->child != NULL)) {
-                               t = print_otag(h, TAG_DT, "csWl",
+                               t = print_otag(h, TAG_DT, "csw+-l",
                                    cattr, bl->norm->Bl.width);
                                print_text(h, "\\ ");
                                print_tagq(h, t);
@@ -770,7 +760,7 @@ mdoc_it_pre(MDOC_ARGS)
                                print_text(h, "\\ ");
                                print_tagq(h, t);
                        }
-                       print_otag(h, TAG_DT, "csWl", cattr,
+                       print_otag(h, TAG_DT, "csw+-l", cattr,
                            bl->norm->Bl.width);
                        break;
                case ROFFT_BODY:
@@ -833,7 +823,7 @@ mdoc_bl_pre(MDOC_ARGS)
 
                t = print_otag(h, TAG_COLGROUP, "");
                for (i = 0; i < bl->ncols - 1; i++)
-                       print_otag(h, TAG_COL, "sww", bl->cols[i]);
+                       print_otag(h, TAG_COL, "sw+w", bl->cols[i]);
                print_otag(h, TAG_COL, "swW", bl->cols[i]);
                print_tagq(h, t);
                return 0;
@@ -880,7 +870,7 @@ mdoc_bl_pre(MDOC_ARGS)
                cattr = "Bl-tag";
                if (bl->offs)
                        print_otag(h, TAG_DIV, "cswl", cattr, bl->offs);
-               print_otag(h, TAG_DL, "cswl", cattr, bl->width);
+               print_otag(h, TAG_DL, "csw+l", cattr, bl->width);
                return 1;
        case LIST_column:
                elemtype = TAG_TABLE;
@@ -1001,9 +991,9 @@ mdoc_bd_pre(MDOC_ARGS)
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {
+               case ROFF_br:
+               case ROFF_sp:
                case MDOC_Sm:
-               case MDOC_br:
-               case MDOC_sp:
                case MDOC_Bl:
                case MDOC_D1:
                case MDOC_Dl:
@@ -1317,53 +1307,39 @@ mdoc_pp_pre(MDOC_ARGS)
        return 0;
 }
 
-static int
-mdoc_sp_pre(MDOC_ARGS)
-{
-       struct roffsu    su;
-
-       SCALE_VS_INIT(&su, 1);
-
-       if (MDOC_sp == n->tok) {
-               if (NULL != (n = n->child)) {
-                       if ( ! a2roffsu(n->string, &su, SCALE_VS))
-                               su.scale = 1.0;
-                       else if (su.scale < 0.0)
-                               su.scale = 0.0;
-               }
-       } else
-               su.scale = 0.0;
-
-       print_otag(h, TAG_DIV, "suh", &su);
-
-       /* So the div isn't empty: */
-       print_text(h, "\\~");
-
-       return 0;
-
-}
-
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
+       const struct roff_node *link, *descr, *punct;
        struct tag      *t;
 
-       if ((n = n->child) == NULL)
+       if ((link = n->child) == NULL)
                return 0;
 
+       /* Find beginning of trailing punctuation. */
+       punct = n->last;
+       while (punct != link && punct->flags & NODE_DELIMC)
+               punct = punct->prev;
+       punct = punct->next;
+
        /* Link target and link text. */
-       t = print_otag(h, TAG_A, "cTh", "Lk", n->string);
-       if (n->next == NULL || n->next->flags & NODE_DELIMC)
-               print_text(h, n->string);
-       for (n = n->next; n != NULL && !(n->flags & NODE_DELIMC); n = n->next)
-               print_text(h, n->string);
+       descr = link->next;
+       if (descr == punct)
+               descr = link;  /* no text */
+       t = print_otag(h, TAG_A, "cTh", "Lk", link->string);
+       do {
+               if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+                       h->flags |= HTML_NOSPACE;
+               print_text(h, descr->string);
+               descr = descr->next;
+       } while (descr != punct);
        print_tagq(h, t);
 
        /* Trailing punctuation. */
-       while (n != NULL) {
+       while (punct != NULL) {
                h->flags |= HTML_NOSPACE;
-               print_text(h, n->string);
-               n = n->next;
+               print_text(h, punct->string);
+               punct = punct->next;
        }
        return 0;
 }