From 0fa320cc54378a5ff17d42e0fe5286de519231bb Mon Sep 17 00:00:00 2001 From: schwarze Date: Tue, 16 Dec 2014 19:48:49 +0000 Subject: [PATCH] correct -Tutf8 and -Thtml rendering of \(~= and change the name of \(-~ to \(|= to agree with groff; difference found by Carsten dot Kunze at arcor dot de --- regress/usr.bin/mandoc/char/unicode/named.in | 3 ++- .../usr.bin/mandoc/char/unicode/named.out_ascii | 3 ++- regress/usr.bin/mandoc/char/unicode/named.out_html | 3 ++- regress/usr.bin/mandoc/char/unicode/named.out_utf8 | 3 ++- regress/usr.bin/mandoc/char/unicode/nogroff.in | 8 -------- .../usr.bin/mandoc/char/unicode/nogroff.out_ascii | 8 -------- .../usr.bin/mandoc/char/unicode/nogroff.out_html | 8 -------- .../usr.bin/mandoc/char/unicode/nogroff.out_utf8 | 8 -------- share/man/man7/mandoc_char.7 | 14 +++++++------- usr.bin/mandoc/chars.in | 6 +++--- 10 files changed, 18 insertions(+), 46 deletions(-) diff --git a/regress/usr.bin/mandoc/char/unicode/named.in b/regress/usr.bin/mandoc/char/unicode/named.in index 4459a2f3436..4b1c4f36216 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.in +++ b/regress/usr.bin/mandoc/char/unicode/named.in @@ -119,8 +119,9 @@ BEGINTEST \[u222B]\(is INTEGRAL \[u2234]\(tf\(3d THEREFORE \[u223C]\(ap TILDE OPERATOR +\[u2243]\(|= ASYMPTOTICALLY EQUAL TO \[u2245]\(=~ APPROXIMATELY EQUAL TO -\[u2248]\(~~ ALMOST EQUAL TO +\[u2248]\(~~\(~= ALMOST EQUAL TO \[u2260]\(!= NOT EQUAL TO \[u2261]\(== IDENTICAL TO \[u2262]\(ne NOT IDENTICAL TO diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_ascii b/regress/usr.bin/mandoc/char/unicode/named.out_ascii index 5888e41ed40..b1a46d607c7 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.out_ascii +++ b/regress/usr.bin/mandoc/char/unicode/named.out_ascii @@ -122,8 +122,9 @@ DDEESSCCRRIIPPTTIIOONN ',I',I INTEGRAL .:..:..:. THEREFORE ~~ TILDE OPERATOR + -~-~ ASYMPTOTICALLY EQUAL TO =~=~ APPROXIMATELY EQUAL TO - ~~~~ ALMOST EQUAL TO + ~~~~~= ALMOST EQUAL TO !=!= NOT EQUAL TO ==== IDENTICAL TO !==!== NOT IDENTICAL TO diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_html b/regress/usr.bin/mandoc/char/unicode/named.out_html index 0141c5797c8..a40ff7cd2ed 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.out_html +++ b/regress/usr.bin/mandoc/char/unicode/named.out_html @@ -114,8 +114,9 @@ BEGINTEST
∫∫ INTEGRAL
∴∴∴ THEREFORE
∼∼ TILDE OPERATOR
+≃≃ ASYMPTOTICALLY EQUAL TO
≅≅ APPROXIMATELY EQUAL TO
-≈≈ ALMOST EQUAL TO
+≈≈≈ ALMOST EQUAL TO
≠≠ NOT EQUAL TO
≡≡ IDENTICAL TO
≢≢ NOT IDENTICAL TO
diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_utf8 b/regress/usr.bin/mandoc/char/unicode/named.out_utf8 index 2fcc7a7e31c..284ed639c37 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.out_utf8 +++ b/regress/usr.bin/mandoc/char/unicode/named.out_utf8 @@ -122,8 +122,9 @@ DDEESSCCRRIIPPTTIIOONN ∫∫ INTEGRAL ∴∴∴ THEREFORE ∼∼ TILDE OPERATOR + ≃≃ ASYMPTOTICALLY EQUAL TO ≅≅ APPROXIMATELY EQUAL TO - ≈≈ ALMOST EQUAL TO + ≈≈≈ ALMOST EQUAL TO ≠≠ NOT EQUAL TO ≡≡ IDENTICAL TO ≢≢ NOT IDENTICAL TO diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.in b/regress/usr.bin/mandoc/char/unicode/nogroff.in index 924e756d44f..9e62f5f3ee7 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.in +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.in @@ -22,16 +22,8 @@ BEGINTEST \[u009E]\N'158' PRIVACY MESSAGE \[u009F]\N'159' APPLICATION PROGRAM COMMAND \[u2022]\(bu BULLET -\[u2243]\(-~ ASYMPTOTICALLY EQUAL TO -\[u224C]\(~= ALL EQUAL TO \[u226A]\(<< MUCH LESS-THAN \[u226B]\(>> MUCH GREATER-THAN -\[u23A7]\(lt LEFT CURLY BRACKET UPPER HOOK -\[u23A8]\(lk LEFT CURLY BRACKET MIDDLE PIECE -\[u23A9]\(lb LEFT CURLY BRACKET LOWER HOOK -\[u23AB]\(rt RIGHT CURLY BRACKET UPPER HOOK -\[u23AC]\(rk RIGHT CURLY BRACKET MIDDLE PIECE -\[u23AD]\(rb RIGHT CURLY BRACKET LOWER HOOK \[uFB00]\(ff LATIN SMALL LIGATURE FF \[uFB01]\(fi LATIN SMALL LIGATURE FI \[uFB02]\(fl LATIN SMALL LIGATURE FL diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii b/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii index fb156a44f07..c5928f56e3c 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii @@ -25,16 +25,8 @@ DDEESSCCRRIIPPTTIIOONN <9E><9E> PRIVACY MESSAGE <9F><9F> APPLICATION PROGRAM COMMAND +o+o BULLET - -~-~ ASYMPTOTICALLY EQUAL TO - ~=~= ALL EQUAL TO <<<< MUCH LESS-THAN >>>> MUCH GREATER-THAN - ,-,- LEFT CURLY BRACKET UPPER HOOK - {{ LEFT CURLY BRACKET MIDDLE PIECE - `-`- LEFT CURLY BRACKET LOWER HOOK - -.-. RIGHT CURLY BRACKET UPPER HOOK - }} RIGHT CURLY BRACKET MIDDLE PIECE - -'-' RIGHT CURLY BRACKET LOWER HOOK ffff LATIN SMALL LIGATURE FF fifi LATIN SMALL LIGATURE FI flfl LATIN SMALL LIGATURE FL diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html index 677dd84b318..e82ae1ba58d 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html @@ -17,16 +17,8 @@ BEGINTEST
�� <control> PRIVACY MESSAGE
�� <control> APPLICATION PROGRAM COMMAND
•• BULLET
-≃≃ ASYMPTOTICALLY EQUAL TO
-≌≌ ALL EQUAL TO
≪≪ MUCH LESS-THAN
≫≫ MUCH GREATER-THAN
-⎧⎧ LEFT CURLY BRACKET UPPER HOOK
-⎨⎨ LEFT CURLY BRACKET MIDDLE PIECE
-⎩⎩ LEFT CURLY BRACKET LOWER HOOK
-⎫⎫ RIGHT CURLY BRACKET UPPER HOOK
-⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE
-⎭⎭ RIGHT CURLY BRACKET LOWER HOOK
ffff LATIN SMALL LIGATURE FF
fifi LATIN SMALL LIGATURE FI
flfl LATIN SMALL LIGATURE FL
diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 b/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 index 748099ebdeb..2bf195443d4 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 @@ -25,16 +25,8 @@ DDEESSCCRRIIPPTTIIOONN �� PRIVACY MESSAGE �� APPLICATION PROGRAM COMMAND •• BULLET - ≃≃ ASYMPTOTICALLY EQUAL TO - ≌≌ ALL EQUAL TO ≪≪ MUCH LESS-THAN ≫≫ MUCH GREATER-THAN - ⎧⎧ LEFT CURLY BRACKET UPPER HOOK - ⎨⎨ LEFT CURLY BRACKET MIDDLE PIECE - ⎩⎩ LEFT CURLY BRACKET LOWER HOOK - ⎫⎫ RIGHT CURLY BRACKET UPPER HOOK - ⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE - ⎭⎭ RIGHT CURLY BRACKET LOWER HOOK ffff LATIN SMALL LIGATURE FF fifi LATIN SMALL LIGATURE FI flfl LATIN SMALL LIGATURE FL diff --git a/share/man/man7/mandoc_char.7 b/share/man/man7/mandoc_char.7 index d27e28221ca..e6d28a83e36 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.21 2014/12/15 19:41:24 schwarze Exp $ +.\" $OpenBSD: mandoc_char.7,v 1.22 2014/12/16 19:48:49 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: December 15 2014 $ +.Dd $Mdocdate: December 16 2014 $ .Dt MANDOC_CHAR 7 .Os .Sh NAME @@ -369,11 +369,11 @@ Mathematical: .It \e(!= Ta \(!= Ta not equal .It \e(== Ta \(== Ta equivalent .It \e(ne Ta \(ne Ta not equivalent -.It \e(=~ Ta \(=~ Ta congruent -.It \e(-~ Ta \(-~ Ta asymptotically congruent -.It \e(ap Ta \(ap Ta asymptotically similar -.It \e(~~ Ta \(~~ Ta approximately similar -.It \e(~= Ta \(~= Ta approximately equal +.It \e(ap Ta \(ap Ta tilde operator +.It \e(|= Ta \(|= Ta asymptotically equal +.It \e(=~ Ta \(=~ Ta approximately equal +.It \e(~~ Ta \(~~ Ta almost equal +.It \e(~= Ta \(~= Ta almost equal .It \e(pt Ta \(pt Ta proportionate .It \e(es Ta \(es Ta empty set .It \e(mo Ta \(mo Ta element diff --git a/usr.bin/mandoc/chars.in b/usr.bin/mandoc/chars.in index fe5fb0fdf25..b05e0812253 100644 --- a/usr.bin/mandoc/chars.in +++ b/usr.bin/mandoc/chars.in @@ -1,4 +1,4 @@ -/* $OpenBSD: chars.in,v 1.26 2014/12/15 19:41:24 schwarze Exp $ */ +/* $OpenBSD: chars.in,v 1.27 2014/12/16 19:48:49 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -281,10 +281,10 @@ CHAR("!=", "!=", 8800) CHAR("==", "==", 8801) CHAR("ne", "!==", 8802) CHAR("=~", "=~", 8773) -CHAR("-~", "-~", 8771) +CHAR("|=", "-~", 8771) CHAR("ap", "~", 8764) CHAR("~~", "~~", 8776) -CHAR("~=", "~=", 8780) +CHAR("~=", "~=", 8776) CHAR("pt", "oc", 8733) CHAR("es", "{}", 8709) CHAR("mo", "E", 8712) -- 2.20.1