use the portable \(lq and \(rq internally rather than \(Lq and \(Rq

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 471c52ca804d2a7d01fe1d39a516abb7382d865e..4a163b620620f4c10c8f5e220343ece68be2e546 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.363 2017/06/08 12:54:58 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.366 2018/04/05 09:17:26 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) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -540,7 +540,7 @@ a2width(const struct termp *p, const char *v)
                SCALE_HS_INIT(&su, term_strlen(p, v));
                su.scale /= term_strlen(p, "0");
        }
                SCALE_HS_INIT(&su, term_strlen(p, v));
                su.scale /= term_strlen(p, "0");
        }

-       return term_hspan(p, &su) / 24;
+       return term_hen(p, &su);

 }
 
 /*
 }
 
 /*


@@ -686,7 +686,7 @@ termp_it_pre(DECL_ARGS)
                        SCALE_HS_INIT(&su,
                            term_strlen(p, bl->norm->Bl.cols[i]));
                        su.scale /= term_strlen(p, "0");
                        SCALE_HS_INIT(&su,
                            term_strlen(p, bl->norm->Bl.cols[i]));
                        su.scale /= term_strlen(p, "0");

-                       offset += term_hspan(p, &su) / 24 + dcol;
+                       offset += term_hen(p, &su) + dcol;

                }
 
                /*
                }
 
                /*


@@ -704,7 +704,7 @@ termp_it_pre(DECL_ARGS)
                 */
                SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i]));
                su.scale /= term_strlen(p, "0");
                 */
                SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i]));
                su.scale /= term_strlen(p, "0");

-               width = term_hspan(p, &su) / 24 + dcol;
+               width = term_hen(p, &su) + dcol;

                break;
        default:
                if (NULL == bl->norm->Bl.width)
                break;
        default:
                if (NULL == bl->norm->Bl.width)


@@ -1664,7 +1664,7 @@ termp_quote_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:

-               term_word(p, "\\(Lq");
+               term_word(p, "\\(lq");

                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||


@@ -1722,7 +1722,7 @@ termp_quote_post(DECL_ARGS)
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:

-               term_word(p, "\\(Rq");
+               term_word(p, "\\(rq");

                break;
        case MDOC_En:
                if (n->norm->Es == NULL ||
                break;
        case MDOC_En:
                if (n->norm->Es == NULL ||


@@ -1940,7 +1940,6 @@ static int
 termp_lk_pre(DECL_ARGS)
 {
        const struct roff_node *link, *descr, *punct;
 termp_lk_pre(DECL_ARGS)
 {
        const struct roff_node *link, *descr, *punct;

-       int display;

 
        if ((link = n->child) == NULL)
                return 0;
 
        if ((link = n->child) == NULL)
                return 0;


@@ -1966,11 +1965,6 @@ termp_lk_pre(DECL_ARGS)
        }
 
        /* Link target. */
        }
 
        /* 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);
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, link->string);
        term_fontpop(p);


@@ -1981,8 +1975,6 @@ termp_lk_pre(DECL_ARGS)
                term_word(p, punct->string);
                punct = punct->next;
        }
                term_word(p, punct->string);
                punct = punct->next;
        }

-       if (display)
-               term_newln(p);

        return 0;
 }
 
        return 0;
 }