When .Sm is called without an argument, groff toggles the spacing mode,

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index ac1e43b44a469f60cf699e53e13fdcb552975882..7133330287bd6277857d4675eba70baec787ee39 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.189 2014/04/20 20:18:12 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.192 2014/07/02 19:55:10 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -97,7 +97,6 @@ static        int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
 static int               mdoc_lk_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
 static int               mdoc_lk_pre(MDOC_ARGS);

-static int               mdoc_ll_pre(MDOC_ARGS);

 static int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);


@@ -111,6 +110,7 @@ static      int               mdoc_quote_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_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_sm_pre(MDOC_ARGS);
 static int               mdoc_sp_pre(MDOC_ARGS);
 static int               mdoc_ss_pre(MDOC_ARGS);


@@ -157,7 +157,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_nd_pre, NULL}, /* Nd */
        {mdoc_nm_pre, NULL}, /* Nm */
        {mdoc_quote_pre, mdoc_quote_post}, /* Op */
        {mdoc_nd_pre, NULL}, /* Nd */
        {mdoc_nm_pre, NULL}, /* Nm */
        {mdoc_quote_pre, mdoc_quote_post}, /* Op */

-       {NULL, NULL}, /* Ot */
+       {mdoc_ft_pre, NULL}, /* Ot */

        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_rv_pre, NULL}, /* Rv */
        {NULL, NULL}, /* St */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_rv_pre, NULL}, /* Rv */
        {NULL, NULL}, /* St */


@@ -227,7 +227,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */

-       {NULL, NULL}, /* Fr */
+       {mdoc_em_pre, NULL}, /* Fr */

        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
        {mdoc_pp_pre, NULL}, /* Lp */
        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
        {mdoc_pp_pre, NULL}, /* Lp */


@@ -237,15 +237,15 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_quote_pre, mdoc_quote_post}, /* Bro */
        {NULL, NULL}, /* Brc */
        {mdoc__x_pre, mdoc__x_post}, /* %C */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bro */
        {NULL, NULL}, /* Brc */
        {mdoc__x_pre, mdoc__x_post}, /* %C */

-       {NULL, NULL}, /* Es */  /* TODO */
-       {NULL, NULL}, /* En */  /* TODO */
+       {mdoc_skip_pre, NULL}, /* Es */
+       {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_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_ll_pre, NULL}, /* ll */
+       {mdoc_skip_pre, NULL}, /* ll */

 };
 
 static const char * const lists[LIST_MAX] = {
 };
 
 static const char * const lists[LIST_MAX] = {


@@ -515,18 +515,15 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
 static int
 mdoc_root_pre(MDOC_ARGS)
 {

-       char             b[BUFSIZ];

        struct htmlpair  tag[3];
        struct tag      *t, *tt;
        struct htmlpair  tag[3];
        struct tag      *t, *tt;

-       char            *title;
+       char            *volume, *title;

 
 

-       strlcpy(b, meta->vol, BUFSIZ);
-
-       if (meta->arch) {
-               strlcat(b, " (", BUFSIZ);
-               strlcat(b, meta->arch, BUFSIZ);
-               strlcat(b, ")", BUFSIZ);
-       }
+       if (NULL == meta->arch)
+               volume = mandoc_strdup(meta->vol);
+       else
+               mandoc_asprintf(&volume, "%s (%s)",
+                   meta->vol, meta->arch);

 
        mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec);
 
 
        mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec);
 


@@ -551,7 +548,7 @@ mdoc_root_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[0], "head-vol");
        PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
        print_otag(h, TAG_TD, 2, tag);
        PAIR_CLASS_INIT(&tag[0], "head-vol");
        PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
        print_otag(h, TAG_TD, 2, tag);

-       print_text(h, b);
+       print_text(h, volume);

        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");


@@ -561,6 +558,7 @@ mdoc_root_pre(MDOC_ARGS)
        print_tagq(h, t);
 
        free(title);
        print_tagq(h, t);
 
        free(title);

+       free(volume);

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


@@ -993,8 +991,8 @@ mdoc_bl_pre(MDOC_ARGS)
        PAIR_STYLE_INIT(&tag[0], h);
 
        assert(lists[n->norm->Bl.type]);
        PAIR_STYLE_INIT(&tag[0], h);
 
        assert(lists[n->norm->Bl.type]);

-       strlcpy(buf, "list ", BUFSIZ);
-       strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
+       (void)strlcpy(buf, "list ", BUFSIZ);
+       (void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);

        PAIR_INIT(&tag[1], ATTR_CLASS, buf);
 
        /* Set the block's left-hand margin. */
        PAIR_INIT(&tag[1], ATTR_CLASS, buf);
 
        /* Set the block's left-hand margin. */


@@ -1363,6 +1361,15 @@ mdoc_fd_pre(MDOC_ARGS)
 
        if (NULL != (n = n->next)) {
                assert(MDOC_TEXT == n->type);
 
        if (NULL != (n = n->next)) {
                assert(MDOC_TEXT == n->type);

+
+               /*
+                * XXX This is broken and not easy to fix.
+                * When using -Oincludes, truncation may occur.
+                * Dynamic allocation wouldn't help because
+                * passing long strings to buffmt_includes()
+                * does not work either.
+                */
+

                strlcpy(buf, '<' == *n->string || '"' == *n->string ?
                    n->string + 1 : n->string, BUFSIZ);
 
                strlcpy(buf, '<' == *n->string || '"' == *n->string ?
                    n->string + 1 : n->string, BUFSIZ);
 


@@ -1475,10 +1482,8 @@ mdoc_fn_pre(MDOC_ARGS)
 
        t = print_otag(h, TAG_B, 1, tag);
 
 
        t = print_otag(h, TAG_B, 1, tag);
 

-       if (sp) {
-               strlcpy(nbuf, sp, BUFSIZ);
-               print_text(h, nbuf);
-       }
+       if (sp)
+               print_text(h, sp);

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


@@ -1519,28 +1524,21 @@ static int
 mdoc_sm_pre(MDOC_ARGS)
 {
 
 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.  Thus, if we have
-                *  .Bd -literal
-                *  .Sm off
-                *  1 2
-                *  .Sm on
-                *  3
-                *  .Ed
-                * the "3" is preceded by a space.
-                */
-               h->flags &= ~HTML_NOSPACE;
+       if (NULL == n->child)
+               h->flags ^= HTML_NONOSPACE;
+       else if (0 == strcmp("on", n->child->string))

                h->flags &= ~HTML_NONOSPACE;
                h->flags &= ~HTML_NONOSPACE;

-       } else
+       else

                h->flags |= HTML_NONOSPACE;
 
                h->flags |= HTML_NONOSPACE;
 

+       if ( ! (HTML_NONOSPACE & h->flags))
+               h->flags &= ~HTML_NOSPACE;
+

        return(0);
 }
 
 static int
        return(0);
 }
 
 static int

-mdoc_ll_pre(MDOC_ARGS)
+mdoc_skip_pre(MDOC_ARGS)

 {
 
        return(0);
 {
 
        return(0);


@@ -2080,6 +2078,12 @@ mdoc_quote_pre(MDOC_ARGS)
                PAIR_CLASS_INIT(&tag, "opt");
                print_otag(h, TAG_SPAN, 1, &tag);
                break;
                PAIR_CLASS_INIT(&tag, "opt");
                print_otag(h, TAG_SPAN, 1, &tag);
                break;

+       case MDOC_En:
+               if (NULL == n->norm->Es ||
+                   NULL == n->norm->Es->child)
+                       return(1);
+               print_text(h, n->norm->Es->child->string);
+               break;

        case MDOC_Eo:
                break;
        case MDOC_Do:
        case MDOC_Eo:
                break;
        case MDOC_Do:


@@ -2123,7 +2127,8 @@ mdoc_quote_post(MDOC_ARGS)
        if (MDOC_BODY != n->type)
                return;
 
        if (MDOC_BODY != n->type)
                return;
 

-       h->flags |= HTML_NOSPACE;
+       if (MDOC_En != n->tok)
+               h->flags |= HTML_NOSPACE;

 
        switch (n->tok) {
        case MDOC_Ao:
 
        switch (n->tok) {
        case MDOC_Ao:


@@ -2145,6 +2150,14 @@ mdoc_quote_post(MDOC_ARGS)
        case MDOC_Bq:
                print_text(h, "\\(rB");
                break;
        case MDOC_Bq:
                print_text(h, "\\(rB");
                break;

+       case MDOC_En:
+               if (NULL != n->norm->Es &&
+                   NULL != n->norm->Es->child &&
+                   NULL != n->norm->Es->child->next) {
+                       h->flags |= HTML_NOSPACE;
+                       print_text(h, n->norm->Es->child->next->string);
+               }
+               break;

        case MDOC_Eo:
                break;
        case MDOC_Qo:
        case MDOC_Eo:
                break;
        case MDOC_Qo: