summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2014-03-05 23:14:37 +0000
committerschwarze <schwarze@openbsd.org>2014-03-05 23:14:37 +0000
commit594c3703d9ab69dab452509ee0415ffba7d11db2 (patch)
tree521faaad7050b5af1cd501121039e1e77e194c4f
parentconsistently say buflen so i know what length it is (diff)
downloadwireguard-openbsd-594c3703d9ab69dab452509ee0415ffba7d11db2.tar.xz
wireguard-openbsd-594c3703d9ab69dab452509ee0415ffba7d11db2.zip
In -Tutf8 mode, mandoc_char(7) named accent character escape sequences
have to render as non-combining accents; if you want combining accents, you have to explicitly specify them using the Unicode character numbers for combining accents, or you can use character escape sequences for accented characters. This lets mandoc behave like groff. Additionally, both the Ossanna/Kernighan/Ritter troff manual and the GNU troff manual say that \' and \` are equivalent to \(aa and \(ga, respectively, so do the same for these. This mitigates issues with man(7) code autogenerated by texinfo2man(1), which mistranslates TeX ` and ' to \` and \' instead of \(oq and \(cq as reported by sthen@ and as analyzed by bentley@.
-rw-r--r--usr.bin/mandoc/chars.in24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/mandoc/chars.in b/usr.bin/mandoc/chars.in
index 35db1f0387f..27d29763e4b 100644
--- a/usr.bin/mandoc/chars.in
+++ b/usr.bin/mandoc/chars.in
@@ -1,4 +1,4 @@
-/* $Id: chars.in,v 1.20 2014/01/22 20:58:35 schwarze Exp $ */
+/* $Id: chars.in,v 1.21 2014/03/05 23:14:37 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -49,21 +49,21 @@ CHAR("c", "", 0)
CHAR("}", "", 0)
/* Accents. */
-CHAR("a\"", "\"", 779)
+CHAR("a\"", "\"", 733)
CHAR("a-", "-", 175)
CHAR("a.", ".", 729)
-CHAR("a^", "^", 770)
-CHAR("\'", "\'", 769)
-CHAR("aa", "\'", 769)
-CHAR("ga", "`", 768)
-CHAR("`", "`", 768)
-CHAR("ab", "`", 774)
-CHAR("ac", ",", 807)
-CHAR("ad", "\"", 776)
+CHAR("a^", "^", 94)
+CHAR("\'", "\'", 180)
+CHAR("aa", "\'", 180)
+CHAR("ga", "`", 96)
+CHAR("`", "`", 96)
+CHAR("ab", "`", 728)
+CHAR("ac", ",", 184)
+CHAR("ad", "\"", 168)
CHAR("ah", "v", 711)
CHAR("ao", "o", 730)
-CHAR("a~", "~", 771)
-CHAR("ho", ",", 808)
+CHAR("a~", "~", 126)
+CHAR("ho", ",", 731)
CHAR("ha", "^", 94)
CHAR("ti", "~", 126)