preconv_encode() can take a const input buffer;

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index f496483bdad314b9879f01a34b63f60a39e3a16f..e82451416699425b16bfea203616da094d66f9aa 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.268 2017/02/05 20:34:57 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.271 2017/02/16 03:00:23 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -110,6 +110,7 @@ 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_sy_pre(MDOC_ARGS);
 static int               mdoc_va_pre(MDOC_ARGS);
@@ -155,7 +156,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_ft_pre, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_ex_pre, NULL}, /* Rv */
-       {NULL, NULL}, /* St */
+       {mdoc_st_pre, NULL}, /* St */
        {mdoc_va_pre, NULL}, /* Va */
        {mdoc_vt_pre, NULL}, /* Vt */
        {mdoc_xr_pre, NULL}, /* Xr */
@@ -173,7 +174,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Ac */
        {mdoc_quote_pre, mdoc_quote_post}, /* Ao */
        {mdoc_quote_pre, mdoc_quote_post}, /* Aq */
-       {NULL, NULL}, /* At */
+       {mdoc_xx_pre, NULL}, /* At */
        {NULL, NULL}, /* Bc */
        {mdoc_bf_pre, NULL}, /* Bf */
        {mdoc_quote_pre, mdoc_quote_post}, /* Bo */
@@ -416,8 +417,6 @@ print_mdoc_node(MDOC_ARGS)
                (*mdocs[n->tok].post)(meta, n, h);
                if (n->end != ENDBODY_NOT)
                        n->body->flags |= NODE_ENDED;
-               if (n->end == ENDBODY_NOSPACE)
-                       h->flags |= HTML_NOSPACE;
                break;
        }
 }
@@ -581,8 +580,6 @@ mdoc_nm_pre(MDOC_ARGS)
                /* FALLTHROUGH */
        case ROFFT_ELEM:
                print_otag(h, TAG_B, "c", "Nm");
-               if (n->child == NULL && meta->name != NULL)
-                       print_text(h, meta->name);
                return 1;
        case ROFFT_BODY:
                print_otag(h, TAG_TD, "");
@@ -894,6 +891,13 @@ mdoc_ex_pre(MDOC_ARGS)
        return 1;
 }
 
+static int
+mdoc_st_pre(MDOC_ARGS)
+{
+       print_otag(h, TAG_SPAN, "c", "St");
+       return 1;
+}
+
 static int
 mdoc_em_pre(MDOC_ARGS)
 {