Let .Do .Dq .Ql .So .Sq generate the correct roff(7) character escape

sequences such that output modes like -Tutf8 have a chance to select
nice glyphs.  This doesn't change anything for -Tascii, and, for now,
it doesn't affect -Tps and -Tpdf either.
OK matthew@ bentley@; like the idea tedu@; no opinion jmc@.

diff --git a/mdoc_man.c b/mdoc_man.c
index dba05063bb1f980cab816ade44556c92d9fba1d5..7a28ea78c73aaa32cd671c7888b01da632663ece 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.50 2013/05/29 15:40:22 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.51 2013/06/02 18:16:57 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -182,8 +182,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, NULL, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
-       { cond_body, pre_enc, post_enc, "``", "''" }, /* Do */
-       { cond_body, pre_enc, post_enc, "``", "''" }, /* Dq */
+       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Do */
+       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Dq */
        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
@@ -199,14 +199,14 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Po */
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Pq */
        { NULL, NULL, NULL, NULL, NULL }, /* Qc */
-       { cond_body, pre_enc, post_enc, "`", "'" }, /* Ql */
+       { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* Ql */
        { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qo */
        { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qq */
        { NULL, NULL, NULL, NULL, NULL }, /* Re */
        { cond_body, pre_rs, NULL, NULL, NULL }, /* Rs */
        { NULL, NULL, NULL, NULL, NULL }, /* Sc */
-       { cond_body, pre_enc, post_enc, "`", "'" }, /* So */
-       { cond_body, pre_enc, post_enc, "`", "'" }, /* Sq */
+       { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* So */
+       { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* Sq */
        { NULL, pre_sm, NULL, NULL, NULL }, /* Sm */
        { NULL, pre_em, post_font, NULL, NULL }, /* Sx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Sy */

diff --git a/mdoc_term.c b/mdoc_term.c
index 8b059067021870e5a9ba1e7531ffc22ab7d35bfe..99c595393a70343217a87ac1a7b92cd7dc70ea46 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.248 2013/05/29 16:11:40 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.249 2013/06/02 18:16:57 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -1925,7 +1925,7 @@ termp_quote_pre(DECL_ARGS)
        case (MDOC_Do):
                /* FALLTHROUGH */
        case (MDOC_Dq):
-               term_word(p, "``");
+               term_word(p, "\\(lq");
                break;
        case (MDOC_Eo):
                break;
@@ -1946,7 +1946,7 @@ termp_quote_pre(DECL_ARGS)
        case (MDOC_So):
                /* FALLTHROUGH */
        case (MDOC_Sq):
-               term_word(p, "`");
+               term_word(p, "\\(oq");
                break;
        default:
                abort();
@@ -1991,7 +1991,7 @@ termp_quote_post(DECL_ARGS)
        case (MDOC_Do):
                /* FALLTHROUGH */
        case (MDOC_Dq):
-               term_word(p, "''");
+               term_word(p, "\\(rq");
                break;
        case (MDOC_Eo):
                break;
@@ -2012,7 +2012,7 @@ termp_quote_post(DECL_ARGS)
        case (MDOC_So):
                /* FALLTHROUGH */
        case (MDOC_Sq):
-               term_word(p, "'");
+               term_word(p, "\\(cq");
                break;
        default:
                abort();