Fix a typo that caused a non-constant string

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 0f71a16b0f5403e9011f437773ecce25eb43f829..0b4b9adf34f286d045f8ddf32ca21e1abc910c1d 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.277 2017/03/15 11:29:53 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.294 2017/07/15 17:57:51 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * 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 <unistd.h>
 
 #include "mandoc_aux.h"

+#include "mandoc.h"

 #include "roff.h"
 #include "mdoc.h"
 #include "out.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_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);
 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 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 */
        {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_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 */
        {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_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__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.
                 */
                 * 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);
                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);
                        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;
        }
                        child = (*mdocs[n->tok].pre)(meta, n, h);
                break;
        }


@@ -412,7 +417,9 @@ print_mdoc_node(MDOC_ARGS)
        case ROFFT_EQN:
                break;
        default:
        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)
                        break;
                (*mdocs[n->tok].post)(meta, n, h);
                if (n->end != ENDBODY_NOT)


@@ -501,7 +508,8 @@ mdoc_sh_pre(MDOC_ARGS)
        case ROFFT_HEAD:
                id = html_make_id(n);
                print_otag(h, TAG_H1, "cTi", "Sh", id);
        case ROFFT_HEAD:
                id = html_make_id(n);
                print_otag(h, TAG_H1, "cTi", "Sh", id);

-               print_otag(h, TAG_A, "chR", "selflink", id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "selflink", id);

                free(id);
                break;
        case ROFFT_BODY:
                free(id);
                break;
        case ROFFT_BODY:


@@ -524,7 +532,8 @@ mdoc_ss_pre(MDOC_ARGS)
 
        id = html_make_id(n);
        print_otag(h, TAG_H2, "cTi", "Ss", id);
 
        id = html_make_id(n);
        print_otag(h, TAG_H2, "cTi", "Ss", id);

-       print_otag(h, TAG_A, "chR", "selflink", id);
+       if (id != NULL)
+               print_otag(h, TAG_A, "chR", "selflink", id);

        free(id);
        return 1;
 }
        free(id);
        return 1;
 }


@@ -577,9 +586,6 @@ mdoc_nd_pre(MDOC_ARGS)
 static int
 mdoc_nm_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, "");
        switch (n->type) {
        case ROFFT_HEAD:
                print_otag(h, TAG_TD, "");


@@ -593,22 +599,8 @@ mdoc_nm_pre(MDOC_ARGS)
        default:
                break;
        }
        default:
                break;
        }

-

        synopsis_pre(h, n);
        print_otag(h, TAG_TABLE, "c", "Nm");
        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;
 }
        print_otag(h, TAG_TR, "");
        return 1;
 }


@@ -723,10 +715,7 @@ mdoc_it_pre(MDOC_ARGS)
                case ROFFT_HEAD:
                        return 0;
                case ROFFT_BODY:
                case ROFFT_HEAD:
                        return 0;
                case ROFFT_BODY:

-                       if (bl->norm->Bl.comp)
-                               print_otag(h, TAG_LI, "csvt", cattr, 0);
-                       else
-                               print_otag(h, TAG_LI, "c", cattr);
+                       print_otag(h, TAG_LI, "c", cattr);

                        break;
                default:
                        break;
                        break;
                default:
                        break;


@@ -738,15 +727,12 @@ mdoc_it_pre(MDOC_ARGS)
        case LIST_ohang:
                switch (n->type) {
                case ROFFT_HEAD:
        case LIST_ohang:
                switch (n->type) {
                case ROFFT_HEAD:

-                       if (bl->norm->Bl.comp)
-                               print_otag(h, TAG_DT, "csvt", cattr, 0);
-                       else
-                               print_otag(h, TAG_DT, "c", cattr);
+                       print_otag(h, TAG_DT, "c", cattr);

                        if (type == LIST_diag)
                                print_otag(h, TAG_B, "c", cattr);
                        break;
                case ROFFT_BODY:
                        if (type == LIST_diag)
                                print_otag(h, TAG_B, "c", cattr);
                        break;
                case ROFFT_BODY:

-                       print_otag(h, TAG_DD, "cswl", cattr,
+                       print_otag(h, TAG_DD, "csw*+l", cattr,

                            bl->norm->Bl.width);
                        break;
                default:
                            bl->norm->Bl.width);
                        break;
                default:


@@ -760,7 +746,7 @@ mdoc_it_pre(MDOC_ARGS)
                            (n->parent->prev == NULL ||
                             n->parent->prev->body == NULL ||
                             n->parent->prev->body->child != NULL)) {
                            (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);
                                    cattr, bl->norm->Bl.width);
                                print_text(h, "\\ ");
                                print_tagq(h, t);


@@ -768,7 +754,7 @@ mdoc_it_pre(MDOC_ARGS)
                                print_text(h, "\\ ");
                                print_tagq(h, t);
                        }
                                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:
                            bl->norm->Bl.width);
                        break;
                case ROFFT_BODY:


@@ -788,10 +774,7 @@ mdoc_it_pre(MDOC_ARGS)
                case ROFFT_HEAD:
                        break;
                case ROFFT_BODY:
                case ROFFT_HEAD:
                        break;
                case ROFFT_BODY:

-                       if (bl->norm->Bl.comp)
-                               print_otag(h, TAG_TD, "csvt", cattr, 0);
-                       else
-                               print_otag(h, TAG_TD, "c", cattr);
+                       print_otag(h, TAG_TD, "c", cattr);

                        break;
                default:
                        print_otag(h, TAG_TR, "c", cattr);
                        break;
                default:
                        print_otag(h, TAG_TR, "c", cattr);


@@ -806,9 +789,9 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {

+       char             cattr[21];

        struct tag      *t;
        struct mdoc_bl  *bl;
        struct tag      *t;
        struct mdoc_bl  *bl;

-       const char      *cattr;

        size_t           i;
        enum htmltag     elemtype;
 
        size_t           i;
        enum htmltag     elemtype;
 


@@ -831,7 +814,7 @@ mdoc_bl_pre(MDOC_ARGS)
 
                t = print_otag(h, TAG_COLGROUP, "");
                for (i = 0; i < bl->ncols - 1; i++)
 
                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;
                print_otag(h, TAG_COL, "swW", bl->cols[i]);
                print_tagq(h, t);
                return 0;


@@ -843,50 +826,52 @@ mdoc_bl_pre(MDOC_ARGS)
        switch (bl->type) {
        case LIST_bullet:
                elemtype = TAG_UL;
        switch (bl->type) {
        case LIST_bullet:
                elemtype = TAG_UL;

-               cattr = "Bl-bullet";
+               (void)strlcpy(cattr, "Bl-bullet", sizeof(cattr));

                break;
        case LIST_dash:
        case LIST_hyphen:
                elemtype = TAG_UL;
                break;
        case LIST_dash:
        case LIST_hyphen:
                elemtype = TAG_UL;

-               cattr = "Bl-dash";
+               (void)strlcpy(cattr, "Bl-dash", sizeof(cattr));

                break;
        case LIST_item:
                elemtype = TAG_UL;
                break;
        case LIST_item:
                elemtype = TAG_UL;

-               cattr = "Bl-item";
+               (void)strlcpy(cattr, "Bl-item", sizeof(cattr));

                break;
        case LIST_enum:
                elemtype = TAG_OL;
                break;
        case LIST_enum:
                elemtype = TAG_OL;

-               cattr = "Bl-enum";
+               (void)strlcpy(cattr, "Bl-enum", sizeof(cattr));

                break;
        case LIST_diag:
                elemtype = TAG_DL;
                break;
        case LIST_diag:
                elemtype = TAG_DL;

-               cattr = "Bl-diag";
+               (void)strlcpy(cattr, "Bl-diag", sizeof(cattr));

                break;
        case LIST_hang:
                elemtype = TAG_DL;
                break;
        case LIST_hang:
                elemtype = TAG_DL;

-               cattr = "Bl-hang";
+               (void)strlcpy(cattr, "Bl-hang", sizeof(cattr));

                break;
        case LIST_inset:
                elemtype = TAG_DL;
                break;
        case LIST_inset:
                elemtype = TAG_DL;

-               cattr = "Bl-inset";
+               (void)strlcpy(cattr, "Bl-inset", sizeof(cattr));

                break;
        case LIST_ohang:
                elemtype = TAG_DL;
                break;
        case LIST_ohang:
                elemtype = TAG_DL;

-               cattr = "Bl-ohang";
+               (void)strlcpy(cattr, "Bl-ohang", sizeof(cattr));

                break;
        case LIST_tag:
                break;
        case LIST_tag:

-               cattr = "Bl-tag";

                if (bl->offs)
                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_DIV, "cswl", "Bl-tag", bl->offs);
+               print_otag(h, TAG_DL, "csw*+l", bl->comp ?
+                   "Bl-tag Bl-compact" : "Bl-tag", bl->width);

                return 1;
        case LIST_column:
                elemtype = TAG_TABLE;
                return 1;
        case LIST_column:
                elemtype = TAG_TABLE;

-               cattr = "Bl-column";
+               (void)strlcpy(cattr, "Bl-column", sizeof(cattr));

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

+       if (bl->comp)
+               (void)strlcat(cattr, " Bl-compact", sizeof(cattr));

        print_otag(h, elemtype, "cswl", cattr, bl->offs);
        return 1;
 }
        print_otag(h, elemtype, "cswl", cattr, bl->offs);
        return 1;
 }


@@ -999,9 +984,9 @@ mdoc_bd_pre(MDOC_ARGS)
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {

+               case ROFF_br:
+               case ROFF_sp:

                case MDOC_Sm:
                case MDOC_Sm:

-               case MDOC_br:
-               case MDOC_sp:

                case MDOC_Bl:
                case MDOC_D1:
                case MDOC_Dl:
                case MDOC_Bl:
                case MDOC_D1:
                case MDOC_Dl:


@@ -1315,48 +1300,40 @@ mdoc_pp_pre(MDOC_ARGS)
        return 0;
 }
 
        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)
 {
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {

-       if (NULL == (n = n->child))
-               return 0;
-
-       assert(n->type == ROFFT_TEXT);
-
-       print_otag(h, TAG_A, "cTh", "Lk", n->string);
+       const struct roff_node *link, *descr, *punct;
+       struct tag      *t;

 
 

-       if (NULL == n->next)
-               print_text(h, n->string);
+       if ((link = n->child) == NULL)
+               return 0;

 
 

-       for (n = n->next; n; n = n->next)
-               print_text(h, n->string);
+       /* 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. */
+       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 (punct != NULL) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, punct->string);
+               punct = punct->next;
+       }

        return 0;
 }
 
        return 0;
 }