summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-02-17 18:28:06 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-02-17 18:28:06 +0000
commit6314f1e80963a3b0062af9c80947fb76e5452a4b (patch)
tree96d797b55474f4052cb41078a93ad7d7634f451a
parent5c5fdc42dc7ed248744aa0a3575af541ab29269f (diff)
downloadmandoc-6314f1e80963a3b0062af9c80947fb76e5452a4b.tar.gz
Many people have been complaining for a long time that ``...'' looks
ugly in -Tascii output. For that reason, bentley@ submitted patches to render "..." instead to groff in November 2014 (yes, more than two years ago). Carsten Kunze yesterday merged them for the upcoming groff-1.22.4 release. Yay! Consequently, do the same in mandoc: Render \(Lq and \(Rq (which are used for .Do, .Dq, .Lb, and .St) as '"' in -Tascii output. All other output modes including -Tutf8 remain unchanged.
-rw-r--r--chars.c4
-rw-r--r--regress/mdoc/Dq/empty.out_ascii3
-rw-r--r--regress/mdoc/Lb/badargs.out_ascii4
-rw-r--r--regress/mdoc/Lb/break.out_ascii4
-rw-r--r--regress/mdoc/Lb/eos.out_ascii2
-rw-r--r--regress/mdoc/Op/broken.out_ascii4
-rw-r--r--regress/mdoc/St/badargs.out_ascii4
-rw-r--r--regress/mdoc/St/call.out_ascii2
-rw-r--r--regress/roff/cond/before-Dd.out_ascii2
-rw-r--r--regress/roff/de/escname.out_ascii2
-rw-r--r--regress/roff/esc/c.out_ascii2
11 files changed, 16 insertions, 17 deletions
diff --git a/chars.c b/chars.c
index c4d237c9..c4dfa5b2 100644
--- a/chars.c
+++ b/chars.c
@@ -101,8 +101,8 @@ static struct ln lines[] = {
{ "bq", ",", 0x201a },
{ "lq", "\"", 0x201c },
{ "rq", "\"", 0x201d },
- { "Lq", "``", 0x201c },
- { "Rq", "''", 0x201d },
+ { "Lq", "\"", 0x201c },
+ { "Rq", "\"", 0x201d },
{ "oq", "`", 0x2018 },
{ "cq", "\'", 0x2019 },
{ "aq", "\'", 0x0027 },
diff --git a/regress/mdoc/Dq/empty.out_ascii b/regress/mdoc/Dq/empty.out_ascii
index aaa69621..e8f1da5b 100644
--- a/regress/mdoc/Dq/empty.out_ascii
+++ b/regress/mdoc/Dq/empty.out_ascii
@@ -4,7 +4,6 @@ NNAAMMEE
DDqq--eemmppttyy - empty implicit enclosure macros
DDEESSCCRRIIPPTTIIOONN
- An empty ``'' and a full ``user@host'' quotation. And another ``full''
- one.
+ An empty "" and a full "user@host" quotation. And another "full" one.
OpenBSD October 21, 2010 OpenBSD
diff --git a/regress/mdoc/Lb/badargs.out_ascii b/regress/mdoc/Lb/badargs.out_ascii
index f5bd4afe..cfc2b0ff 100644
--- a/regress/mdoc/Lb/badargs.out_ascii
+++ b/regress/mdoc/Lb/badargs.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
LLbb--bbaaddaarrggss - bad arguments to the library macro
LLIIBBRRAARRYY
- library ``murks''
- library ``mylib'' another
+ library "murks"
+ library "mylib" another
OpenBSD January 2, 2011 OpenBSD
diff --git a/regress/mdoc/Lb/break.out_ascii b/regress/mdoc/Lb/break.out_ascii
index 6c9e5698..a6f0eebf 100644
--- a/regress/mdoc/Lb/break.out_ascii
+++ b/regress/mdoc/Lb/break.out_ascii
@@ -4,10 +4,10 @@ NNAAMMEE
LLbb--bbrreeaakk - output line breaks after the library macro
LLIIBBRRAARRYY
- library ``mylib''
+ library "mylib"
text
DDEESSCCRRIIPPTTIIOONN
- library ``mylib'' text
+ library "mylib" text
OpenBSD June 30, 2010 OpenBSD
diff --git a/regress/mdoc/Lb/eos.out_ascii b/regress/mdoc/Lb/eos.out_ascii
index bbb726f1..0db13295 100644
--- a/regress/mdoc/Lb/eos.out_ascii
+++ b/regress/mdoc/Lb/eos.out_ascii
@@ -4,6 +4,6 @@ NNAAMMEE
LLbb--eeooss - end of sentence handling after the library macro
DDEESSCCRRIIPPTTIIOONN
- Let's use the library ``mylib''. And some other libraries.
+ Let's use the library "mylib". And some other libraries.
OpenBSD November 17, 2012 OpenBSD
diff --git a/regress/mdoc/Op/broken.out_ascii b/regress/mdoc/Op/broken.out_ascii
index f9641277..317a0489 100644
--- a/regress/mdoc/Op/broken.out_ascii
+++ b/regress/mdoc/Op/broken.out_ascii
@@ -4,8 +4,8 @@ NNAAMMEE
OOpp--bbrrookkeenn - partial implicit block broken by partial explicit block
DDEESSCCRRIIPPTTIIOONN
- before both ``inside first [inside both'' inside second] after both
+ before both "inside first [inside both" inside second] after both
- 0 ``1 [12 [123'' 23]] 0
+ 0 "1 [12 [123" 23]] 0
OpenBSD July 2, 2014 OpenBSD
diff --git a/regress/mdoc/St/badargs.out_ascii b/regress/mdoc/St/badargs.out_ascii
index a32ff83b..70c7418e 100644
--- a/regress/mdoc/St/badargs.out_ascii
+++ b/regress/mdoc/St/badargs.out_ascii
@@ -4,13 +4,13 @@ NNAAMMEE
SStt--iinnvvaalliidd - handling of invalid standard argument
SSTTAANNDDAARRDDSS
- valid argument: IEEE Std 1003.1-2004 (``POSIX.1'')
+ valid argument: IEEE Std 1003.1-2004 ("POSIX.1")
invalid argument:
no arguments:
- two arguments: IEEE Std 1003.1-2004 (``POSIX.1'') murks
+ two arguments: IEEE Std 1003.1-2004 ("POSIX.1") murks
end of file
diff --git a/regress/mdoc/St/call.out_ascii b/regress/mdoc/St/call.out_ascii
index 17f04404..dc9b55b6 100644
--- a/regress/mdoc/St/call.out_ascii
+++ b/regress/mdoc/St/call.out_ascii
@@ -6,7 +6,7 @@ NNAAMMEE
SSTTAANNDDAARRDDSS
calling another macro: --ccaalllleedd
- valid argument: IEEE Std 1003.1-2004 (``POSIX.1'')
+ valid argument: IEEE Std 1003.1-2004 ("POSIX.1")
end of file
diff --git a/regress/roff/cond/before-Dd.out_ascii b/regress/roff/cond/before-Dd.out_ascii
index f14a44fe..373e920f 100644
--- a/regress/roff/cond/before-Dd.out_ascii
+++ b/regress/roff/cond/before-Dd.out_ascii
@@ -10,7 +10,7 @@ DDEESSCCRRIIPPTTIIOONN
with unknown macro errors.
If the present document looks like a proper mdoc(7) document and the
- following display reads ``mytext'', then the problem did not come back:
+ following display reads "mytext", then the problem did not come back:
mytext
diff --git a/regress/roff/de/escname.out_ascii b/regress/roff/de/escname.out_ascii
index 9a2d825a..4f9a3a3d 100644
--- a/regress/roff/de/escname.out_ascii
+++ b/regress/roff/de/escname.out_ascii
@@ -16,7 +16,7 @@ DDEESSCCRRIIPPTTIIOONN
Remove all but second: val2
- macro seperated from argument by an escape sequence: ``argument''
+ macro seperated from argument by an escape sequence: "argument"
final text
diff --git a/regress/roff/esc/c.out_ascii b/regress/roff/esc/c.out_ascii
index 5ddc8443..a0f6a996 100644
--- a/regress/roff/esc/c.out_ascii
+++ b/regress/roff/esc/c.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
eesscc--cc - the roff escape c sequence: remove trailing space
DDEESSCCRRIIPPTTIIOONN
- No space between ``one'' and ``word'': oneword
+ No space between "one" and "word": oneword
oneword