Place mandoc.css into the public domain.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 4e420c5c2114b87ff77ea50bef1d605496ba8cf2..073cd4cb51559923180c182eb8b38a5090eda9b3 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.364 2017/06/14 17:51:15 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.368 2018/08/17 20:33:38 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -47,7 +47,7 @@ struct        termpair {
                  const struct roff_meta *meta, \
                  struct roff_node *n
 
-struct termact {
+struct mdoc_term_act {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
@@ -124,7 +124,7 @@ static      int       termp_vt_pre(DECL_ARGS);
 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
 
-static const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
+static const struct mdoc_term_act mdoc_term_acts[MDOC_MAX - MDOC_Dd] = {
        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
@@ -246,7 +246,6 @@ static      const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
        { NULL, termp____post }, /* %U */
        { NULL, NULL }, /* Ta */
 };
-static const struct termact *const termacts = __termacts - MDOC_Dd;
 
 static int      fn_prio;
 
@@ -283,7 +282,9 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                        p->defindent = 5;
                term_begin(p, print_mdoc_head, print_mdoc_foot,
                    &mdoc->meta);
-               while (n != NULL && n->flags & NODE_NOPRT)
+               while (n != NULL &&
+                   (n->type == ROFFT_COMMENT ||
+                    n->flags & NODE_NOPRT))
                        n = n->next;
                if (n != NULL) {
                        if (n->tok != MDOC_Sh)
@@ -308,11 +309,12 @@ print_mdoc_nodelist(DECL_ARGS)
 static void
 print_mdoc_node(DECL_ARGS)
 {
-       int              chld;
+       const struct mdoc_term_act *act;
        struct termpair  npair;
        size_t           offset, rmargin;
+       int              chld;
 
-       if (n->flags & NODE_NOPRT)
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
                return;
 
        chld = 1;
@@ -368,10 +370,10 @@ print_mdoc_node(DECL_ARGS)
                        return;
                }
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
-               if (termacts[n->tok].pre != NULL &&
+               act = mdoc_term_acts + (n->tok - MDOC_Dd);
+               if (act->pre != NULL &&
                    (n->end == ENDBODY_NOT || n->child != NULL))
-                       chld = (*termacts[n->tok].pre)
-                               (p, &npair, meta, n);
+                       chld = (*act->pre)(p, &npair, meta, n);
                break;
        }
 
@@ -389,9 +391,9 @@ print_mdoc_node(DECL_ARGS)
        case ROFFT_EQN:
                break;
        default:
-               if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED)
+               if (act->post == NULL || n->flags & NODE_ENDED)
                        break;
-               (void)(*termacts[n->tok].post)(p, &npair, meta, n);
+               (void)(*act->post)(p, &npair, meta, n);
 
                /*
                 * Explicit end tokens not only call the post
@@ -567,7 +569,9 @@ print_bvspace(struct termp *p,
        /* Do not vspace directly after Ss/Sh. */
 
        nn = n;
-       while (nn->prev != NULL && nn->prev->flags & NODE_NOPRT)
+       while (nn->prev != NULL &&
+           (nn->prev->type == ROFFT_COMMENT ||
+            nn->prev->flags & NODE_NOPRT))
                nn = nn->prev;
        while (nn->prev == NULL) {
                do {
@@ -1550,7 +1554,8 @@ termp_ss_pre(DECL_ARGS)
        case ROFFT_BLOCK:
                term_newln(p);
                for (nn = n->prev; nn != NULL; nn = nn->prev)
-                       if ((nn->flags & NODE_NOPRT) == 0)
+                       if (nn->type != ROFFT_COMMENT &&
+                           (nn->flags & NODE_NOPRT) == 0)
                                break;
                if (nn != NULL)
                        term_vspace(p);
@@ -1664,7 +1669,7 @@ termp_quote_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:
-               term_word(p, "\\(Lq");
+               term_word(p, "\\(lq");
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
@@ -1722,7 +1727,7 @@ termp_quote_post(DECL_ARGS)
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:
-               term_word(p, "\\(Rq");
+               term_word(p, "\\(rq");
                break;
        case MDOC_En:
                if (n->norm->Es == NULL ||
@@ -1940,7 +1945,6 @@ static int
 termp_lk_pre(DECL_ARGS)
 {
        const struct roff_node *link, *descr, *punct;
-       int display;
 
        if ((link = n->child) == NULL)
                return 0;
@@ -1966,11 +1970,6 @@ termp_lk_pre(DECL_ARGS)
        }
 
        /* Link target. */
-       display = term_strlen(p, link->string) >= 26;
-       if (display) {
-               term_newln(p);
-               p->tcol->offset += term_len(p, p->defindent + 1);
-       }
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, link->string);
        term_fontpop(p);
@@ -1981,8 +1980,6 @@ termp_lk_pre(DECL_ARGS)
                term_word(p, punct->string);
                punct = punct->next;
        }
-       if (display)
-               term_newln(p);
        return 0;
 }