diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-21 16:06:48 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-21 16:06:48 +0000 |
| commit | 13eca495ce65af310d2aeaa717684ccbaa617070 (patch) | |
| tree | 50bdff14e9147e1297986c9c00a6a100d7e3e096 | |
| parent | e09ab5e214ab66b3c06b5a2d97189910b20b8075 (diff) | |
| download | mandoc-13eca495ce65af310d2aeaa717684ccbaa617070.tar.gz | |
Improve the ASCII rendering of \(Po (Pound Sterling)
and of the playing card suits to match groff, using feedback
from Ralph Corderoy <ralph at inputplus dot co dot uk>.
| -rw-r--r-- | chars.c | 10 | ||||
| -rw-r--r-- | regress/char/unicode/latin1.in | 14 | ||||
| -rw-r--r-- | regress/char/unicode/latin1.out_ascii | 12 | ||||
| -rw-r--r-- | regress/char/unicode/latin1.out_html | 10 | ||||
| -rw-r--r-- | regress/char/unicode/latin1.out_utf8 | 12 | ||||
| -rw-r--r-- | regress/char/unicode/latin1diff.in | 10 | ||||
| -rw-r--r-- | regress/char/unicode/latin1diff.out_ascii | 8 | ||||
| -rw-r--r-- | regress/char/unicode/latin1diff.out_html | 6 | ||||
| -rw-r--r-- | regress/char/unicode/latin1diff.out_utf8 | 8 | ||||
| -rw-r--r-- | regress/char/unicode/named.in | 13 | ||||
| -rw-r--r-- | regress/char/unicode/named.out_ascii | 11 | ||||
| -rw-r--r-- | regress/char/unicode/named.out_html | 11 | ||||
| -rw-r--r-- | regress/char/unicode/named.out_utf8 | 11 | ||||
| -rw-r--r-- | regress/char/unicode/namediff.in | 14 | ||||
| -rw-r--r-- | regress/char/unicode/namediff.out_ascii | 12 | ||||
| -rw-r--r-- | regress/char/unicode/namediff.out_html | 12 | ||||
| -rw-r--r-- | regress/char/unicode/namediff.out_utf8 | 12 | ||||
| -rw-r--r-- | term_ascii.c | 2 |
18 files changed, 92 insertions, 96 deletions
@@ -83,10 +83,10 @@ static struct ln lines[] = { { "sh", "#", 0x0023 }, { "CR", "<cr>", 0x21b5 }, { "OK", "\\/", 0x2713 }, - { "CL", "<club>", 0x2663 }, - { "SP", "<spade>", 0x2660 }, - { "HE", "<heart>", 0x2665 }, - { "DI", "<diamond>", 0x2666 }, + { "CL", "C", 0x2663 }, + { "SP", "S", 0x2660 }, + { "HE", "H", 0x2665 }, + { "DI", "D", 0x2666 }, /* Legal symbols. */ { "co", "(C)", 0x00a9 }, @@ -363,7 +363,7 @@ static struct ln lines[] = { { "Eu", "EUR", 0x20ac }, { "eu", "EUR", 0x20ac }, { "Ye", "=\bY", 0x00a5 }, - { "Po", "GBP", 0x00a3 }, + { "Po", "-\bL", 0x00a3 }, { "Cs", "o\bx", 0x00a4 }, { "Fn", ",\bf", 0x0192 }, diff --git a/regress/char/unicode/latin1.in b/regress/char/unicode/latin1.in index 34a6caaf..8ef82888 100644 --- a/regress/char/unicode/latin1.in +++ b/regress/char/unicode/latin1.in @@ -1,11 +1,13 @@ -.\" $OpenBSD: latin1.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $ -.TH CHAR-UNICODE-LATIN1 1 "October 27, 2014" +.\" $OpenBSD: latin1.in,v 1.6 2018/08/21 16:01:38 schwarze Exp $ +.TH CHAR-UNICODE-LATIN1 1 "August 21, 2018" .SH NAME char-unicode-latin1 \- Unicode characters in the ISO-8859-1 range .SH DESCRIPTION .nf BEGINTEST +\[u00A1]\(r! INVERTED EXCLAMATION MARK \[u00A2]\(ct CENT SIGN +\[u00A3]\(Po POUND SIGN \[u00A4]\(Cs CURRENCY SIGN \[u00A5]\(Ye YEN SIGN \[u00A6]\(bb BROKEN BAR @@ -32,6 +34,7 @@ BEGINTEST \[u00BC]\(14 VULGAR FRACTION ONE QUARTER \[u00BD]\(12 VULGAR FRACTION ONE HALF \[u00BE]\(34 VULGAR FRACTION THREE QUARTERS +\[u00BF]\(r? INVERTED QUESTION MARK \[u00C0]\(`A LATIN CAPITAL LETTER A WITH GRAVE \[u00C1]\('A LATIN CAPITAL LETTER A WITH ACUTE \[u00C2]\(^A LATIN CAPITAL LETTER A WITH CIRCUMFLEX @@ -61,7 +64,9 @@ BEGINTEST \[u00DA]\('U LATIN CAPITAL LETTER U WITH ACUTE \[u00DB]\(^U LATIN CAPITAL LETTER U WITH CIRCUMFLEX \[u00DC]\(:U LATIN CAPITAL LETTER U WITH DIAERESIS -\[u00DD] LATIN CAPITAL LETTER Y WITH ACUTE +\[u00DD]\('Y LATIN CAPITAL LETTER Y WITH ACUTE +\[u00DE]\(TP LATIN CAPITAL LETTER THORN +\[u00DF]\(ss LATIN SMALL LETTER SHARP S \[u00E0]\(`a LATIN SMALL LETTER A WITH GRAVE \[u00E1]\('a LATIN SMALL LETTER A WITH ACUTE \[u00E2]\(^a LATIN SMALL LETTER A WITH CIRCUMFLEX @@ -91,7 +96,8 @@ BEGINTEST \[u00FA]\('u LATIN SMALL LETTER U WITH ACUTE \[u00FB]\(^u LATIN SMALL LETTER U WITH CIRCUMFLEX \[u00FC]\(:u LATIN SMALL LETTER U WITH DIAERESIS -\[u00FD] LATIN SMALL LETTER Y WITH ACUTE +\[u00FD]\('y LATIN SMALL LETTER Y WITH ACUTE +\[u00FE]\(Tp LATIN SMALL LETTER THORN \[u00FF]\(:y LATIN SMALL LETTER Y WITH DIAERESIS ENDTEST .fi diff --git a/regress/char/unicode/latin1.out_ascii b/regress/char/unicode/latin1.out_ascii index 7b2e5198..a279c5df 100644 --- a/regress/char/unicode/latin1.out_ascii +++ b/regress/char/unicode/latin1.out_ascii @@ -7,7 +7,9 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN BEGINTEST + !! INVERTED EXCLAMATION MARK /c/c CENT SIGN + -L-L POUND SIGN oxox CURRENCY SIGN =Y=Y YEN SIGN || BROKEN BAR @@ -34,6 +36,7 @@ DDEESSCCRRIIPPTTIIOONN 1/41/4 VULGAR FRACTION ONE QUARTER 1/21/2 VULGAR FRACTION ONE HALF 3/43/4 VULGAR FRACTION THREE QUARTERS + ?? INVERTED QUESTION MARK `A`A LATIN CAPITAL LETTER A WITH GRAVE 'A'A LATIN CAPITAL LETTER A WITH ACUTE ^A^A LATIN CAPITAL LETTER A WITH CIRCUMFLEX @@ -63,7 +66,9 @@ DDEESSCCRRIIPPTTIIOONN 'U'U LATIN CAPITAL LETTER U WITH ACUTE ^U^U LATIN CAPITAL LETTER U WITH CIRCUMFLEX "U"U LATIN CAPITAL LETTER U WITH DIAERESIS - 'Y LATIN CAPITAL LETTER Y WITH ACUTE + 'Y'Y LATIN CAPITAL LETTER Y WITH ACUTE + ThTh LATIN CAPITAL LETTER THORN + ssss LATIN SMALL LETTER SHARP S `a`a LATIN SMALL LETTER A WITH GRAVE 'a'a LATIN SMALL LETTER A WITH ACUTE ^a^a LATIN SMALL LETTER A WITH CIRCUMFLEX @@ -93,10 +98,11 @@ DDEESSCCRRIIPPTTIIOONN 'u'u LATIN SMALL LETTER U WITH ACUTE ^u^u LATIN SMALL LETTER U WITH CIRCUMFLEX "u"u LATIN SMALL LETTER U WITH DIAERESIS - 'y LATIN SMALL LETTER Y WITH ACUTE + 'y'y LATIN SMALL LETTER Y WITH ACUTE + thth LATIN SMALL LETTER THORN "y"y LATIN SMALL LETTER Y WITH DIAERESIS ENDTEST -OpenBSD October 27, 2014 CHAR-UNICODE-LATIN1(1) +OpenBSD August 21, 2018 CHAR-UNICODE-LATIN1(1) diff --git a/regress/char/unicode/latin1.out_html b/regress/char/unicode/latin1.out_html index abd8a3a5..db54b987 100644 --- a/regress/char/unicode/latin1.out_html +++ b/regress/char/unicode/latin1.out_html @@ -1,5 +1,7 @@ BEGINTEST +¡¡ INVERTED EXCLAMATION MARK ¢¢ CENT SIGN +££ POUND SIGN ¤¤ CURRENCY SIGN ¥¥ YEN SIGN ¦¦ BROKEN BAR @@ -26,6 +28,7 @@ BEGINTEST ¼¼ VULGAR FRACTION ONE QUARTER ½½ VULGAR FRACTION ONE HALF ¾¾ VULGAR FRACTION THREE QUARTERS +¿¿ INVERTED QUESTION MARK ÀÀ LATIN CAPITAL LETTER A WITH GRAVE ÁÁ LATIN CAPITAL LETTER A WITH ACUTE  LATIN CAPITAL LETTER A WITH CIRCUMFLEX @@ -55,7 +58,9 @@ BEGINTEST ÚÚ LATIN CAPITAL LETTER U WITH ACUTE ÛÛ LATIN CAPITAL LETTER U WITH CIRCUMFLEX ÜÜ LATIN CAPITAL LETTER U WITH DIAERESIS -Ý LATIN CAPITAL LETTER Y WITH ACUTE +ÝÝ LATIN CAPITAL LETTER Y WITH ACUTE +ÞÞ LATIN CAPITAL LETTER THORN +ßß LATIN SMALL LETTER SHARP S àà LATIN SMALL LETTER A WITH GRAVE áá LATIN SMALL LETTER A WITH ACUTE ââ LATIN SMALL LETTER A WITH CIRCUMFLEX @@ -85,6 +90,7 @@ BEGINTEST úú LATIN SMALL LETTER U WITH ACUTE ûû LATIN SMALL LETTER U WITH CIRCUMFLEX üü LATIN SMALL LETTER U WITH DIAERESIS -ý LATIN SMALL LETTER Y WITH ACUTE +ýý LATIN SMALL LETTER Y WITH ACUTE +þþ LATIN SMALL LETTER THORN ÿÿ LATIN SMALL LETTER Y WITH DIAERESIS ENDTEST diff --git a/regress/char/unicode/latin1.out_utf8 b/regress/char/unicode/latin1.out_utf8 index 36078a1b..e1caa4f8 100644 --- a/regress/char/unicode/latin1.out_utf8 +++ b/regress/char/unicode/latin1.out_utf8 @@ -7,7 +7,9 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN BEGINTEST + ¡¡ INVERTED EXCLAMATION MARK ¢¢ CENT SIGN + ££ POUND SIGN ¤¤ CURRENCY SIGN ¥¥ YEN SIGN ¦¦ BROKEN BAR @@ -34,6 +36,7 @@ DDEESSCCRRIIPPTTIIOONN ¼¼ VULGAR FRACTION ONE QUARTER ½½ VULGAR FRACTION ONE HALF ¾¾ VULGAR FRACTION THREE QUARTERS + ¿¿ INVERTED QUESTION MARK ÀÀ LATIN CAPITAL LETTER A WITH GRAVE ÁÁ LATIN CAPITAL LETTER A WITH ACUTE  LATIN CAPITAL LETTER A WITH CIRCUMFLEX @@ -63,7 +66,9 @@ DDEESSCCRRIIPPTTIIOONN ÚÚ LATIN CAPITAL LETTER U WITH ACUTE ÛÛ LATIN CAPITAL LETTER U WITH CIRCUMFLEX ÜÜ LATIN CAPITAL LETTER U WITH DIAERESIS - Ý LATIN CAPITAL LETTER Y WITH ACUTE + ÝÝ LATIN CAPITAL LETTER Y WITH ACUTE + ÞÞ LATIN CAPITAL LETTER THORN + ßß LATIN SMALL LETTER SHARP S àà LATIN SMALL LETTER A WITH GRAVE áá LATIN SMALL LETTER A WITH ACUTE ââ LATIN SMALL LETTER A WITH CIRCUMFLEX @@ -93,10 +98,11 @@ DDEESSCCRRIIPPTTIIOONN úú LATIN SMALL LETTER U WITH ACUTE ûû LATIN SMALL LETTER U WITH CIRCUMFLEX üü LATIN SMALL LETTER U WITH DIAERESIS - ý LATIN SMALL LETTER Y WITH ACUTE + ýý LATIN SMALL LETTER Y WITH ACUTE + þþ LATIN SMALL LETTER THORN ÿÿ LATIN SMALL LETTER Y WITH DIAERESIS ENDTEST -OpenBSD October 27, 2014 CHAR-UNICODE-LATIN1(1) +OpenBSD August 21, 2018 CHAR-UNICODE-LATIN1(1) diff --git a/regress/char/unicode/latin1diff.in b/regress/char/unicode/latin1diff.in index e00e44de..f4ef19ff 100644 --- a/regress/char/unicode/latin1diff.in +++ b/regress/char/unicode/latin1diff.in @@ -1,16 +1,10 @@ -.\" $OpenBSD: latin1diff.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $ -.TH CHAR-UNICODE-LATIN1DIFF 1 "October 27, 2014" +.\" $OpenBSD: latin1diff.in,v 1.4 2018/08/21 16:01:38 schwarze Exp $ +.TH CHAR-UNICODE-LATIN1DIFF 1 "August 21, 2018" .SH NAME char-unicode-latin1diff \- Unicode characters in the ISO-8859-1 range .SH DESCRIPTION .nf BEGINTEST -\[u00A1]\(r! INVERTED EXCLAMATION MARK -\[u00A3]\(Po POUND SIGN \[u00AF]\(a- MACRON -\[u00BF]\(r? INVERTED QUESTION MARK -\[u00DE]\(TP LATIN CAPITAL LETTER THORN -\[u00DF]\(ss LATIN SMALL LETTER SHARP S -\[u00FE]\(Tp LATIN SMALL LETTER THORN ENDTEST .fi diff --git a/regress/char/unicode/latin1diff.out_ascii b/regress/char/unicode/latin1diff.out_ascii index 40fe33ef..07777620 100644 --- a/regress/char/unicode/latin1diff.out_ascii +++ b/regress/char/unicode/latin1diff.out_ascii @@ -7,15 +7,9 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN BEGINTEST - !! INVERTED EXCLAMATION MARK - GBPGBP POUND SIGN -- MACRON - ?? INVERTED QUESTION MARK - ThTh LATIN CAPITAL LETTER THORN - ssss LATIN SMALL LETTER SHARP S - thth LATIN SMALL LETTER THORN ENDTEST -OpenBSD October 27, 2014 CHAR-UNICODE-LATIN1DIFF(1) +OpenBSD August 21, 2018 CHAR-UNICODE-LATIN1DIFF(1) diff --git a/regress/char/unicode/latin1diff.out_html b/regress/char/unicode/latin1diff.out_html index 38bbade9..5f3b3b17 100644 --- a/regress/char/unicode/latin1diff.out_html +++ b/regress/char/unicode/latin1diff.out_html @@ -1,9 +1,3 @@ BEGINTEST -¡¡ INVERTED EXCLAMATION MARK -££ POUND SIGN ¯¯ MACRON -¿¿ INVERTED QUESTION MARK -ÞÞ LATIN CAPITAL LETTER THORN -ßß LATIN SMALL LETTER SHARP S -þþ LATIN SMALL LETTER THORN ENDTEST diff --git a/regress/char/unicode/latin1diff.out_utf8 b/regress/char/unicode/latin1diff.out_utf8 index 6a679b29..be0053ad 100644 --- a/regress/char/unicode/latin1diff.out_utf8 +++ b/regress/char/unicode/latin1diff.out_utf8 @@ -7,15 +7,9 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN BEGINTEST - ¡¡ INVERTED EXCLAMATION MARK - ££ POUND SIGN ¯¯ MACRON - ¿¿ INVERTED QUESTION MARK - ÞÞ LATIN CAPITAL LETTER THORN - ßß LATIN SMALL LETTER SHARP S - þþ LATIN SMALL LETTER THORN ENDTEST -OpenBSD October 27, 2014 CHAR-UNICODE-LATIN1DIFF(1) +OpenBSD August 21, 2018 CHAR-UNICODE-LATIN1DIFF(1) diff --git a/regress/char/unicode/named.in b/regress/char/unicode/named.in index 21e44362..e8c05152 100644 --- a/regress/char/unicode/named.in +++ b/regress/char/unicode/named.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: named.in,v 1.9 2018/08/21 01:56:26 schwarze Exp $ +.\" $OpenBSD: named.in,v 1.10 2018/08/21 16:01:38 schwarze Exp $ .TH CHAR-UNICODE-NAMED 1 "August 21, 2018" .SH NAME char-unicode-named \- Unicode characters having named escapes @@ -13,8 +13,10 @@ BEGINTEST \[u0152]\(OE LATIN CAPITAL LIGATURE OE \[u0153]\(oe LATIN SMALL LIGATURE OE \[u0192]\(Fn LATIN SMALL LETTER F WITH HOOK +\[u0237]\(.j LATIN SMALL LETTER DOTLESS J \[u02C7]\(ah CARON \[u02D8]\(ab BREVE +\[u02D9]\(a. DOT ABOVE \[u02DA]\(ao RING ABOVE \[u02DB]\(ho OGONEK \[u02DD]\(a" DOUBLE ACUTE ACCENT @@ -118,6 +120,9 @@ BEGINTEST \[u2208]\(mo ELEMENT OF \[u2209]\(nm NOT AN ELEMENT OF \[u220B]\(st CONTAINS AS MEMBER +\[u220F]\[product] N-ARY PRODUCT +\[u2210]\[coproduct] N-ARY COPRODUCT +\[u2211]\[sum] N-ARY SUMMATION \[u2212]\(mi MINUS SIGN \[u2213]\(-+ MINUS-OR-PLUS SIGN \[u2217]\(** ASTERISK OPERATOR @@ -142,6 +147,8 @@ BEGINTEST \[u2265]\(>= GREATER-THAN OR EQUAL TO \[u2282]\(sb SUBSET OF \[u2283]\(sp SUPERSET OF +\[u2284]\(nb NOT A SUBSET OF +\[u2285]\(nc NOT A SUPERSET OF \[u2286]\(ib SUBSET OF OR EQUAL TO \[u2287]\(ip SUPERSET OF OR EQUAL TO \[u2295]\(c+ CIRCLED PLUS @@ -160,6 +167,10 @@ BEGINTEST \[u25CB]\(ci WHITE CIRCLE \[u261C]\(lh WHITE LEFT POINTING INDEX \[u261E]\(rh WHITE RIGHT POINTING INDEX +\[u2660]\(SP BLACK SPADE SUIT +\[u2663]\(CL BLACK CLUB SUIT +\[u2665]\(HE BLACK HEART SUIT +\[u2666]\(DI BLACK DIAMOND SUIT \[u27E8]\(la MATHEMATICAL LEFT ANGLE BRACKET \[u27E9]\(ra MATHEMATICAL RIGHT ANGLE BRACKET ENDTEST diff --git a/regress/char/unicode/named.out_ascii b/regress/char/unicode/named.out_ascii index 530bf7f1..ce09d83f 100644 --- a/regress/char/unicode/named.out_ascii +++ b/regress/char/unicode/named.out_ascii @@ -15,8 +15,10 @@ DDEESSCCRRIIPPTTIIOONN OEOE LATIN CAPITAL LIGATURE OE oeoe LATIN SMALL LIGATURE OE ,f,f LATIN SMALL LETTER F WITH HOOK + jj LATIN SMALL LETTER DOTLESS J vv CARON '`'` BREVE + .. DOT ABOVE oo RING ABOVE ,, OGONEK "" DOUBLE ACUTE ACCENT @@ -120,6 +122,9 @@ DDEESSCCRRIIPPTTIIOONN <element of><element of> ELEMENT OF <not element of><not element of> NOT AN ELEMENT OF <such that><such that> CONTAINS AS MEMBER + <product><product> N-ARY PRODUCT + <coproduct><coproduct> N-ARY COPRODUCT + <sum><sum> N-ARY SUMMATION -- MINUS SIGN -+-+ MINUS-OR-PLUS SIGN ** ASTERISK OPERATOR @@ -144,6 +149,8 @@ DDEESSCCRRIIPPTTIIOONN >=>= GREATER-THAN OR EQUAL TO <proper subset><proper subset> SUBSET OF <proper superset><proper superset> SUPERSET OF + <not subset><not subset> NOT A SUBSET OF + <not superset><not superset> NOT A SUPERSET OF <subset or equal><subset or equal> SUBSET OF OR EQUAL TO <superset or equal><superset or equal> SUPERSET OF OR EQUAL TO O+O+ CIRCLED PLUS @@ -162,6 +169,10 @@ DDEESSCCRRIIPPTTIIOONN OO WHITE CIRCLE <=<= WHITE LEFT POINTING INDEX =>=> WHITE RIGHT POINTING INDEX + SS BLACK SPADE SUIT + CC BLACK CLUB SUIT + HH BLACK HEART SUIT + DD BLACK DIAMOND SUIT << MATHEMATICAL LEFT ANGLE BRACKET >> MATHEMATICAL RIGHT ANGLE BRACKET ENDTEST diff --git a/regress/char/unicode/named.out_html b/regress/char/unicode/named.out_html index 66a3ed0a..5d77d840 100644 --- a/regress/char/unicode/named.out_html +++ b/regress/char/unicode/named.out_html @@ -7,8 +7,10 @@ BEGINTEST ŒŒ LATIN CAPITAL LIGATURE OE œœ LATIN SMALL LIGATURE OE ƒƒ LATIN SMALL LETTER F WITH HOOK +ȷȷ LATIN SMALL LETTER DOTLESS J ˇˇ CARON ˘˘ BREVE +˙˙ DOT ABOVE ˚˚ RING ABOVE ˛˛ OGONEK ˝˝ DOUBLE ACUTE ACCENT @@ -112,6 +114,9 @@ BEGINTEST ∈∈ ELEMENT OF ∉∉ NOT AN ELEMENT OF ∋∋ CONTAINS AS MEMBER +∏∏ N-ARY PRODUCT +∐∐ N-ARY COPRODUCT +∑∑ N-ARY SUMMATION −− MINUS SIGN ∓∓ MINUS-OR-PLUS SIGN ∗∗ ASTERISK OPERATOR @@ -136,6 +141,8 @@ BEGINTEST ≥≥ GREATER-THAN OR EQUAL TO ⊂⊂ SUBSET OF ⊃⊃ SUPERSET OF +⊄⊄ NOT A SUBSET OF +⊅⊅ NOT A SUPERSET OF ⊆⊆ SUBSET OF OR EQUAL TO ⊇⊇ SUPERSET OF OR EQUAL TO ⊕⊕ CIRCLED PLUS @@ -154,6 +161,10 @@ BEGINTEST ○○ WHITE CIRCLE ☜☜ WHITE LEFT POINTING INDEX ☞☞ WHITE RIGHT POINTING INDEX +♠♠ BLACK SPADE SUIT +♣♣ BLACK CLUB SUIT +♥♥ BLACK HEART SUIT +♦♦ BLACK DIAMOND SUIT ⟨⟨ MATHEMATICAL LEFT ANGLE BRACKET ⟩⟩ MATHEMATICAL RIGHT ANGLE BRACKET ENDTEST diff --git a/regress/char/unicode/named.out_utf8 b/regress/char/unicode/named.out_utf8 index 0e5b6853..b5d84f35 100644 --- a/regress/char/unicode/named.out_utf8 +++ b/regress/char/unicode/named.out_utf8 @@ -15,8 +15,10 @@ DDEESSCCRRIIPPTTIIOONN ŒŒ LATIN CAPITAL LIGATURE OE œœ LATIN SMALL LIGATURE OE ƒƒ LATIN SMALL LETTER F WITH HOOK + ȷȷ LATIN SMALL LETTER DOTLESS J ˇˇ CARON ˘˘ BREVE + ˙˙ DOT ABOVE ˚˚ RING ABOVE ˛˛ OGONEK ˝˝ DOUBLE ACUTE ACCENT @@ -120,6 +122,9 @@ DDEESSCCRRIIPPTTIIOONN ∈∈ ELEMENT OF ∉∉ NOT AN ELEMENT OF ∋∋ CONTAINS AS MEMBER + ∏∏ N-ARY PRODUCT + ∐∐ N-ARY COPRODUCT + ∑∑ N-ARY SUMMATION −− MINUS SIGN ∓∓ MINUS-OR-PLUS SIGN ∗∗ ASTERISK OPERATOR @@ -144,6 +149,8 @@ DDEESSCCRRIIPPTTIIOONN ≥≥ GREATER-THAN OR EQUAL TO ⊂⊂ SUBSET OF ⊃⊃ SUPERSET OF + ⊄⊄ NOT A SUBSET OF + ⊅⊅ NOT A SUPERSET OF ⊆⊆ SUBSET OF OR EQUAL TO ⊇⊇ SUPERSET OF OR EQUAL TO ⊕⊕ CIRCLED PLUS @@ -162,6 +169,10 @@ DDEESSCCRRIIPPTTIIOONN ○○ WHITE CIRCLE ☜☜ WHITE LEFT POINTING INDEX ☞☞ WHITE RIGHT POINTING INDEX + ♠♠ BLACK SPADE SUIT + ♣♣ BLACK CLUB SUIT + ♥♥ BLACK HEART SUIT + ♦♦ BLACK DIAMOND SUIT ⟨⟨ MATHEMATICAL LEFT ANGLE BRACKET ⟩⟩ MATHEMATICAL RIGHT ANGLE BRACKET ENDTEST diff --git a/regress/char/unicode/namediff.in b/regress/char/unicode/namediff.in index 8f97bb14..016d79f3 100644 --- a/regress/char/unicode/namediff.in +++ b/regress/char/unicode/namediff.in @@ -1,21 +1,14 @@ -.\" $OpenBSD: namediff.in,v 1.8 2018/08/21 01:56:26 schwarze Exp $ +.\" $OpenBSD: namediff.in,v 1.9 2018/08/21 16:01:38 schwarze Exp $ .TH CHAR-UNICODE-NAMEDIFF 1 "August 21, 2018" .SH NAME char-unicode-namediff \- Unicode characters having named escapes .SH DESCRIPTION .nf BEGINTEST -\[u0237]\(.j LATIN SMALL LETTER DOTLESS J -\[u02D9]\(a. DOT ABOVE \[u203E]\(rn OVERLINE \[u210F]\[hbar]\(-h PLANCK CONSTANT OVER TWO PI \[u2195]\(va UP DOWN ARROW \[u21D5]\(vA UP DOWN DOUBLE ARROW -\[u220F]\[product] N-ARY PRODUCT -\[u2210]\[coproduct] N-ARY COPRODUCT -\[u2211]\[sum] N-ARY SUMMATION -\[u2284]\(nb NOT A SUBSET OF -\[u2285]\(nc NOT A SUPERSET OF \[u239B]\[parenlefttp] LEFT PARENTHESIS UPPER HOOK \[u239C]\[parenleftex] LEFT PARENTHESIS EXTENSION \[u239D]\[parenleftbt] LEFT PARENTHESIS LOWER HOOK @@ -35,10 +28,5 @@ BEGINTEST \[u23AB]\[bracerighttp] RIGHT CURLY BRACKET UPPER HOOK \[u23AC]\[bracerightmid] RIGHT CURLY BRACKET MIDDLE PIECE \[u23AD]\[bracerightbt] RIGHT CURLY BRACKET LOWER HOOK -\[u2660]\(SP BLACK SPADE SUIT -\[u2663]\(CL BLACK CLUB SUIT -\[u2665]\(HE BLACK HEART SUIT -\[u2666]\(DI BLACK DIAMOND SUIT -\[u2713]\(OK CHECK MARK ENDTEST .fi diff --git a/regress/char/unicode/namediff.out_ascii b/regress/char/unicode/namediff.out_ascii index 7a0f3f1f..b275d95c 100644 --- a/regress/char/unicode/namediff.out_ascii +++ b/regress/char/unicode/namediff.out_ascii @@ -7,17 +7,10 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN BEGINTEST - jj LATIN SMALL LETTER DOTLESS J - .. DOT ABOVE -- OVERLINE /h/h/h PLANCK CONSTANT OVER TWO PI ^v^v UP DOWN ARROW ^=v^=v UP DOWN DOUBLE ARROW - <product><product> N-ARY PRODUCT - <coproduct><coproduct> N-ARY COPRODUCT - <sum><sum> N-ARY SUMMATION - <not subset><not subset> NOT A SUBSET OF - <not superset><not superset> NOT A SUPERSET OF // LEFT PARENTHESIS UPPER HOOK || LEFT PARENTHESIS EXTENSION \\ LEFT PARENTHESIS LOWER HOOK @@ -37,11 +30,6 @@ DDEESSCCRRIIPPTTIIOONN -.-. RIGHT CURLY BRACKET UPPER HOOK }} RIGHT CURLY BRACKET MIDDLE PIECE -'-' RIGHT CURLY BRACKET LOWER HOOK - <spade><spade> BLACK SPADE SUIT - <club><club> BLACK CLUB SUIT - <heart><heart> BLACK HEART SUIT - <diamond><diamond> BLACK DIAMOND SUIT - \/\/ CHECK MARK ENDTEST diff --git a/regress/char/unicode/namediff.out_html b/regress/char/unicode/namediff.out_html index 9803aff0..4afee5ce 100644 --- a/regress/char/unicode/namediff.out_html +++ b/regress/char/unicode/namediff.out_html @@ -1,15 +1,8 @@ BEGINTEST -ȷȷ LATIN SMALL LETTER DOTLESS J -˙˙ DOT ABOVE ‾‾ OVERLINE ℏℏℏ PLANCK CONSTANT OVER TWO PI ↕↕ UP DOWN ARROW ⇕⇕ UP DOWN DOUBLE ARROW -∏∏ N-ARY PRODUCT -∐∐ N-ARY COPRODUCT -∑∑ N-ARY SUMMATION -⊄⊄ NOT A SUBSET OF -⊅⊅ NOT A SUPERSET OF ⎛⎛ LEFT PARENTHESIS UPPER HOOK ⎜⎜ LEFT PARENTHESIS EXTENSION ⎝⎝ LEFT PARENTHESIS LOWER HOOK @@ -29,9 +22,4 @@ BEGINTEST ⎫⎫ RIGHT CURLY BRACKET UPPER HOOK ⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE ⎭⎭ RIGHT CURLY BRACKET LOWER HOOK -♠♠ BLACK SPADE SUIT -♣♣ BLACK CLUB SUIT -♥♥ BLACK HEART SUIT -♦♦ BLACK DIAMOND SUIT -✓✓ CHECK MARK ENDTEST diff --git a/regress/char/unicode/namediff.out_utf8 b/regress/char/unicode/namediff.out_utf8 index 78de0900..2965ee1b 100644 --- a/regress/char/unicode/namediff.out_utf8 +++ b/regress/char/unicode/namediff.out_utf8 @@ -7,17 +7,10 @@ NNAAMMEE DDEESSCCRRIIPPTTIIOONN BEGINTEST - ȷȷ LATIN SMALL LETTER DOTLESS J - ˙˙ DOT ABOVE ‾‾ OVERLINE ℏℏℏ PLANCK CONSTANT OVER TWO PI ↕↕ UP DOWN ARROW ⇕⇕ UP DOWN DOUBLE ARROW - ∏∏ N-ARY PRODUCT - ∐∐ N-ARY COPRODUCT - ∑∑ N-ARY SUMMATION - ⊄⊄ NOT A SUBSET OF - ⊅⊅ NOT A SUPERSET OF ⎛⎛ LEFT PARENTHESIS UPPER HOOK ⎜⎜ LEFT PARENTHESIS EXTENSION ⎝⎝ LEFT PARENTHESIS LOWER HOOK @@ -37,11 +30,6 @@ DDEESSCCRRIIPPTTIIOONN ⎫⎫ RIGHT CURLY BRACKET UPPER HOOK ⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE ⎭⎭ RIGHT CURLY BRACKET LOWER HOOK - ♠♠ BLACK SPADE SUIT - ♣♣ BLACK CLUB SUIT - ♥♥ BLACK HEART SUIT - ♦♦ BLACK DIAMOND SUIT - ✓✓ CHECK MARK ENDTEST diff --git a/term_ascii.c b/term_ascii.c index e9a66213..e1cb0546 100644 --- a/term_ascii.c +++ b/term_ascii.c @@ -310,7 +310,7 @@ ascii_uc2str(int uc) "<88>", "<89>", "<8A>", "<8B>", "<8C>", "<8D>", "<8E>", "<8F>", "<90>", "<91>", "<92>", "<93>", "<94>", "<95>", "<96>", "<97>", "<98>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>", - nbrsp, "!", "/\bc", "GBP", "o\bx", "=\bY", "|", "<section>", + nbrsp, "!", "/\bc", "-\bL", "o\bx", "=\bY", "|", "<section>", "\"", "(C)", "_\ba", "<<", "~", "", "(R)", "-", "<degree>","+-","^2", "^3", "'","<micro>","<paragraph>",".", ",", "^1", "_\bo", ">>", "1/4", "1/2", "3/4", "?", |