From e5837833f3338f795a44e9d5703b59b022198a39 Mon Sep 17 00:00:00 2001 From: schwarze Date: Tue, 21 Aug 2018 01:56:26 +0000 Subject: [PATCH] Fix some issues found looking at groff_char(7): * Add two missing characters, \('Y and \('y. * The Weierstrass p is not capital, see http://unicode.org/notes/tn27/. * Add a groff-compatible ASCII transliteration for U+02DC: "~". --- regress/usr.bin/mandoc/char/unicode/named.in | 5 +++-- regress/usr.bin/mandoc/char/unicode/named.out_ascii | 3 ++- regress/usr.bin/mandoc/char/unicode/named.out_html | 1 + regress/usr.bin/mandoc/char/unicode/named.out_utf8 | 3 ++- regress/usr.bin/mandoc/char/unicode/namediff.in | 5 ++--- regress/usr.bin/mandoc/char/unicode/namediff.out_ascii | 3 +-- regress/usr.bin/mandoc/char/unicode/namediff.out_html | 1 - regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 | 3 +-- share/man/man7/mandoc_char.7 | 6 ++++-- usr.bin/mandoc/chars.c | 7 +++++-- 10 files changed, 21 insertions(+), 16 deletions(-) diff --git a/regress/usr.bin/mandoc/char/unicode/named.in b/regress/usr.bin/mandoc/char/unicode/named.in index 8985bebdc7c..21e4436283c 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.in +++ b/regress/usr.bin/mandoc/char/unicode/named.in @@ -1,5 +1,5 @@ -.\" $OpenBSD: named.in,v 1.8 2017/08/23 10:59:53 schwarze Exp $ -.TH CHAR-UNICODE-NAMED 1 "October 27, 2014" +.\" $OpenBSD: named.in,v 1.9 2018/08/21 01:56:26 schwarze Exp $ +.TH CHAR-UNICODE-NAMED 1 "August 21, 2018" .SH NAME char-unicode-named \- Unicode characters having named escapes .SH DESCRIPTION @@ -91,6 +91,7 @@ BEGINTEST \[u2044]\(f/ FRACTION SLASH \[u20AC]\(Eu\(eu EURO SIGN \[u2111]\(Im BLACK-LETTER CAPITAL I +\[u2118]\(wp SCRIPT CAPITAL P \[u211C]\(Re BLACK-LETTER CAPITAL R \[u2122]\(tm TRADE MARK SIGN \[u2135]\(Ah ALEF SYMBOL diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_ascii b/regress/usr.bin/mandoc/char/unicode/named.out_ascii index cc9fd7583e5..530bf7f1235 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.out_ascii +++ b/regress/usr.bin/mandoc/char/unicode/named.out_ascii @@ -93,6 +93,7 @@ DDEESSCCRRIIPPTTIIOONN // FRACTION SLASH EUREUREUR EURO SIGN BLACK-LETTER CAPITAL I + pp SCRIPT CAPITAL P BLACK-LETTER CAPITAL R tmtm TRADE MARK SIGN ALEF SYMBOL @@ -167,4 +168,4 @@ DDEESSCCRRIIPPTTIIOONN -OpenBSD October 27, 2014 CHAR-UNICODE-NAMED(1) +OpenBSD August 21, 2018 CHAR-UNICODE-NAMED(1) diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_html b/regress/usr.bin/mandoc/char/unicode/named.out_html index 6e444470a9e..66a3ed0a6f3 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.out_html +++ b/regress/usr.bin/mandoc/char/unicode/named.out_html @@ -85,6 +85,7 @@ BEGINTEST ⁄⁄ FRACTION SLASH €€€ EURO SIGN ℑℑ BLACK-LETTER CAPITAL I +℘℘ SCRIPT CAPITAL P ℜℜ BLACK-LETTER CAPITAL R ™™ TRADE MARK SIGN ℵℵ ALEF SYMBOL diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_utf8 b/regress/usr.bin/mandoc/char/unicode/named.out_utf8 index ccf0f2006e9..0e5b6853e77 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.out_utf8 +++ b/regress/usr.bin/mandoc/char/unicode/named.out_utf8 @@ -93,6 +93,7 @@ DDEESSCCRRIIPPTTIIOONN ⁄⁄ FRACTION SLASH €€€ EURO SIGN ℑℑ BLACK-LETTER CAPITAL I + ℘℘ SCRIPT CAPITAL P ℜℜ BLACK-LETTER CAPITAL R ™™ TRADE MARK SIGN ℵℵ ALEF SYMBOL @@ -167,4 +168,4 @@ DDEESSCCRRIIPPTTIIOONN -OpenBSD October 27, 2014 CHAR-UNICODE-NAMED(1) +OpenBSD August 21, 2018 CHAR-UNICODE-NAMED(1) diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.in b/regress/usr.bin/mandoc/char/unicode/namediff.in index 740c50b16eb..8f97bb149c1 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.in +++ b/regress/usr.bin/mandoc/char/unicode/namediff.in @@ -1,5 +1,5 @@ -.\" $OpenBSD: namediff.in,v 1.7 2017/08/23 10:59:53 schwarze Exp $ -.TH CHAR-UNICODE-NAMEDIFF 1 "October 27, 2014" +.\" $OpenBSD: namediff.in,v 1.8 2018/08/21 01:56:26 schwarze Exp $ +.TH CHAR-UNICODE-NAMEDIFF 1 "August 21, 2018" .SH NAME char-unicode-namediff \- Unicode characters having named escapes .SH DESCRIPTION @@ -9,7 +9,6 @@ BEGINTEST \[u02D9]\(a. DOT ABOVE \[u203E]\(rn OVERLINE \[u210F]\[hbar]\(-h PLANCK CONSTANT OVER TWO PI -\[u2118]\(wp SCRIPT CAPITAL P \[u2195]\(va UP DOWN ARROW \[u21D5]\(vA UP DOWN DOUBLE ARROW \[u220F]\[product] N-ARY PRODUCT diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii b/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii index 456f9ad633f..7a0f3f1fe04 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii +++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii @@ -11,7 +11,6 @@ DDEESSCCRRIIPPTTIIOONN .. DOT ABOVE -- OVERLINE /h/h/h PLANCK CONSTANT OVER TWO PI - PP SCRIPT CAPITAL P ^v^v UP DOWN ARROW ^=v^=v UP DOWN DOUBLE ARROW N-ARY PRODUCT @@ -47,4 +46,4 @@ DDEESSCCRRIIPPTTIIOONN -OpenBSD October 27, 2014 CHAR-UNICODE-NAMEDIFF(1) +OpenBSD August 21, 2018 CHAR-UNICODE-NAMEDIFF(1) diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_html b/regress/usr.bin/mandoc/char/unicode/namediff.out_html index 8936a5c75c8..9803aff050f 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.out_html +++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_html @@ -3,7 +3,6 @@ BEGINTEST ˙˙ DOT ABOVE ‾‾ OVERLINE ℏℏℏ PLANCK CONSTANT OVER TWO PI -℘℘ SCRIPT CAPITAL P ↕↕ UP DOWN ARROW ⇕⇕ UP DOWN DOUBLE ARROW ∏∏ N-ARY PRODUCT diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 b/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 index ca6ef0af3b2..78de090014b 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 +++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 @@ -11,7 +11,6 @@ DDEESSCCRRIIPPTTIIOONN ˙˙ DOT ABOVE ‾‾ OVERLINE ℏℏℏ PLANCK CONSTANT OVER TWO PI - ℘℘ SCRIPT CAPITAL P ↕↕ UP DOWN ARROW ⇕⇕ UP DOWN DOUBLE ARROW ∏∏ N-ARY PRODUCT @@ -47,4 +46,4 @@ DDEESSCCRRIIPPTTIIOONN -OpenBSD October 27, 2014 CHAR-UNICODE-NAMEDIFF(1) +OpenBSD August 21, 2018 CHAR-UNICODE-NAMEDIFF(1) diff --git a/share/man/man7/mandoc_char.7 b/share/man/man7/mandoc_char.7 index b7a43c060fb..a85c02848b7 100644 --- a/share/man/man7/mandoc_char.7 +++ b/share/man/man7/mandoc_char.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mandoc_char.7,v 1.38 2018/08/10 22:12:40 schwarze Exp $ +.\" $OpenBSD: mandoc_char.7,v 1.39 2018/08/21 01:56:26 schwarze Exp $ .\" .\" Copyright (c) 2003 Jason McIntyre .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: August 10 2018 $ +.Dd $Mdocdate: August 21 2018 $ .Dt MANDOC_CHAR 7 .Os .Sh NAME @@ -543,11 +543,13 @@ Accented letters: .It \e(\(aqI Ta \('I Ta acute I .It \e(\(aqO Ta \('O Ta acute O .It \e(\(aqU Ta \('U Ta acute U +.It \e(\(aqY Ta \('Y Ta acute Y .It \e(\(aqa Ta \('a Ta acute a .It \e(\(aqe Ta \('e Ta acute e .It \e(\(aqi Ta \('i Ta acute i .It \e(\(aqo Ta \('o Ta acute o .It \e(\(aqu Ta \('u Ta acute u +.It \e(\(aqy Ta \('y Ta acute y .It \e(\(gaA Ta \(`A Ta grave A .It \e(\(gaE Ta \(`E Ta grave E .It \e(\(gaI Ta \(`I Ta grave I diff --git a/usr.bin/mandoc/chars.c b/usr.bin/mandoc/chars.c index d6f5f78d0e9..f79dad8c5fc 100644 --- a/usr.bin/mandoc/chars.c +++ b/usr.bin/mandoc/chars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chars.c,v 1.44 2018/08/19 23:47:43 schwarze Exp $ */ +/* $OpenBSD: chars.c,v 1.45 2018/08/21 01:56:26 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze @@ -239,7 +239,7 @@ static struct ln lines[] = { { "Ah", "", 0x2135 }, { "Im", "", 0x2111 }, { "Re", "", 0x211c }, - { "wp", "P", 0x2118 }, + { "wp", "p", 0x2118 }, { "pd", "", 0x2202 }, { "-h", "/h", 0x210f }, { "hbar", "/h", 0x210f }, @@ -286,6 +286,7 @@ static struct ln lines[] = { { "ho", ",", 0x02db }, { "ha", "^", 0x005e }, { "ti", "~", 0x007e }, + { "u02DC", "~", 0x02dc }, /* Accented letters. */ { "'A", "'\bA", 0x00c1 }, @@ -293,11 +294,13 @@ static struct ln lines[] = { { "'I", "'\bI", 0x00cd }, { "'O", "'\bO", 0x00d3 }, { "'U", "'\bU", 0x00da }, + { "'Y", "'\bY", 0x00dd }, { "'a", "'\ba", 0x00e1 }, { "'e", "'\be", 0x00e9 }, { "'i", "'\bi", 0x00ed }, { "'o", "'\bo", 0x00f3 }, { "'u", "'\bu", 0x00fa }, + { "'y", "'\by", 0x00fd }, { "`A", "`\bA", 0x00c0 }, { "`E", "`\bE", 0x00c8 }, { "`I", "`\bI", 0x00cc }, -- 2.20.1