From c6711fced5a9feaa0a8b540a6ce5315f7653807b Mon Sep 17 00:00:00 2001 From: schwarze Date: Mon, 15 Dec 2014 19:41:24 +0000 Subject: [PATCH] correct some character names to match groff; reported by Carsten dot Kunze at arcor dot de --- .../usr.bin/mandoc/char/unicode/namediff.in | 12 +++++++++++ .../mandoc/char/unicode/namediff.out_ascii | 12 +++++++++++ .../mandoc/char/unicode/namediff.out_html | 12 +++++++++++ .../mandoc/char/unicode/namediff.out_utf8 | 12 +++++++++++ .../usr.bin/mandoc/char/unicode/nogroff.in | 5 ----- .../mandoc/char/unicode/nogroff.out_ascii | 5 ----- .../mandoc/char/unicode/nogroff.out_html | 5 ----- .../mandoc/char/unicode/nogroff.out_utf8 | 5 ----- share/man/man7/mandoc_char.7 | 20 +++++++++---------- usr.bin/mandoc/chars.in | 16 +++++++-------- 10 files changed, 66 insertions(+), 38 deletions(-) diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.in b/regress/usr.bin/mandoc/char/unicode/namediff.in index 83daa1324d1..e0039b61ad9 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.in +++ b/regress/usr.bin/mandoc/char/unicode/namediff.in @@ -10,6 +10,7 @@ BEGINTEST \[u03A3]\(*S GREEK CAPITAL LETTER SIGMA \[u201C]\(lq LEFT DOUBLE QUOTATION MARK \[u201D]\(rq RIGHT DOUBLE QUOTATION MARK +\[u203E]\(rn OVERLINE \[u210F]\(-h PLANCK CONSTANT OVER TWO PI \[u2195]\(va UP DOWN ARROW \[u21D5]\(vA UP DOWN DOUBLE ARROW @@ -22,12 +23,23 @@ BEGINTEST \[u2285]\(nc NOT A SUPERSET OF \[u239B]\[parenlefttp] LEFT PARENTHESIS UPPER HOOK \[u239C]\[parenleftex] LEFT PARENTHESIS EXTENSION +\[u239D]\[parenleftbt] LEFT PARENTHESIS LOWER HOOK \[u239E]\[parenrighttp] RIGHT PARENTHESIS UPPER HOOK \[u239F]\[parenrightex] RIGHT PARENTHESIS EXTENSION +\[u23A0]\[parenrightbt] RIGHT PARENTHESIS LOWER HOOK \[u23A1]\[bracketlefttp] LEFT SQUARE BRACKET UPPER CORNER \[u23A2]\[bracketleftex] LEFT SQUARE BRACKET EXTENSION +\[u23A3]\[bracketleftbt] LEFT SQUARE BRACKET LOWER CORNER \[u23A4]\[bracketrighttp] RIGHT SQUARE BRACKET UPPER CORNER \[u23A5]\[bracketrightex] RIGHT SQUARE BRACKET EXTENSION +\[u23A6]\[bracketrightbt] RIGHT SQUARE BRACKET LOWER CORNER +\[u23A7]\[bracelefttp] LEFT CURLY BRACKET UPPER HOOK +\[u23A8]\[braceleftmid] LEFT CURLY BRACKET MIDDLE PIECE +\[u23A9]\[braceleftbt] LEFT CURLY BRACKET LOWER HOOK +\[u23AA]\[braceex]\[braceleftex]\[bracerightex] CURLY BRACKET EXTENSION +\[u23AB]\[bracerighttp] RIGHT CURLY BRACKET UPPER HOOK +\[u23AC]\[bracerightmid] RIGHT CURLY BRACKET MIDDLE PIECE +\[u23AD]\[bracerightbt] RIGHT CURLY BRACKET LOWER HOOK \[u2713]\(OK CHECK MARK ENDTEST .fi diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii b/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii index 0d8a8252b7c..7af81f50401 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii +++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_ascii @@ -13,6 +13,7 @@ DDEESSCCRRIIPPTTIIOONN SS GREEK CAPITAL LETTER SIGMA ```` LEFT DOUBLE QUOTATION MARK '''' RIGHT DOUBLE QUOTATION MARK + -- OVERLINE /h/h PLANCK CONSTANT OVER TWO PI ^v^v UP DOWN ARROW ^=v^=v UP DOWN DOUBLE ARROW @@ -25,12 +26,23 @@ DDEESSCCRRIIPPTTIIOONN !=)!=) NOT A SUPERSET OF // LEFT PARENTHESIS UPPER HOOK || LEFT PARENTHESIS EXTENSION + \\ LEFT PARENTHESIS LOWER HOOK \\ RIGHT PARENTHESIS UPPER HOOK || RIGHT PARENTHESIS EXTENSION + // RIGHT PARENTHESIS LOWER HOOK || LEFT SQUARE BRACKET UPPER CORNER || LEFT SQUARE BRACKET EXTENSION + || LEFT SQUARE BRACKET LOWER CORNER || RIGHT SQUARE BRACKET UPPER CORNER || RIGHT SQUARE BRACKET EXTENSION + || RIGHT SQUARE BRACKET LOWER CORNER + ,-,- LEFT CURLY BRACKET UPPER HOOK + {{ LEFT CURLY BRACKET MIDDLE PIECE + `-`- LEFT CURLY BRACKET LOWER HOOK + |||| CURLY BRACKET EXTENSION + -.-. RIGHT CURLY BRACKET UPPER HOOK + }} RIGHT CURLY BRACKET MIDDLE PIECE + -'-' RIGHT CURLY BRACKET LOWER HOOK \/\/ CHECK MARK ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_html b/regress/usr.bin/mandoc/char/unicode/namediff.out_html index aab99d5d294..41bd720d0cf 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.out_html +++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_html @@ -5,6 +5,7 @@ BEGINTEST
ΣΣ GREEK CAPITAL LETTER SIGMA
““ LEFT DOUBLE QUOTATION MARK
”” RIGHT DOUBLE QUOTATION MARK
+‾‾ OVERLINE
ℏℏ PLANCK CONSTANT OVER TWO PI
↕↕ UP DOWN ARROW
⇕⇕ UP DOWN DOUBLE ARROW
@@ -17,11 +18,22 @@ BEGINTEST
⊅⊅ NOT A SUPERSET OF
⎛⎛ LEFT PARENTHESIS UPPER HOOK
⎜⎜ LEFT PARENTHESIS EXTENSION
+⎝⎝ LEFT PARENTHESIS LOWER HOOK
⎞⎞ RIGHT PARENTHESIS UPPER HOOK
⎟⎟ RIGHT PARENTHESIS EXTENSION
+⎠⎠ RIGHT PARENTHESIS LOWER HOOK
⎡⎡ LEFT SQUARE BRACKET UPPER CORNER
⎢⎢ LEFT SQUARE BRACKET EXTENSION
+⎣⎣ LEFT SQUARE BRACKET LOWER CORNER
⎤⎤ RIGHT SQUARE BRACKET UPPER CORNER
⎥⎥ RIGHT SQUARE BRACKET EXTENSION
+⎦⎦ RIGHT SQUARE BRACKET LOWER CORNER
+⎧⎧ LEFT CURLY BRACKET UPPER HOOK
+⎨⎨ LEFT CURLY BRACKET MIDDLE PIECE
+⎩⎩ LEFT CURLY BRACKET LOWER HOOK
+⎪⎪⎪⎪ CURLY BRACKET EXTENSION
+⎫⎫ RIGHT CURLY BRACKET UPPER HOOK
+⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE
+⎭⎭ RIGHT CURLY BRACKET LOWER HOOK
✓✓ CHECK MARK
ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 b/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 index e20837a2752..ddb63a43d0a 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 +++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_utf8 @@ -13,6 +13,7 @@ DDEESSCCRRIIPPTTIIOONN ΣΣ GREEK CAPITAL LETTER SIGMA ““ LEFT DOUBLE QUOTATION MARK ”” RIGHT DOUBLE QUOTATION MARK + ‾‾ OVERLINE ℏℏ PLANCK CONSTANT OVER TWO PI ↕↕ UP DOWN ARROW ⇕⇕ UP DOWN DOUBLE ARROW @@ -25,12 +26,23 @@ DDEESSCCRRIIPPTTIIOONN ⊅⊅ NOT A SUPERSET OF ⎛⎛ LEFT PARENTHESIS UPPER HOOK ⎜⎜ LEFT PARENTHESIS EXTENSION + ⎝⎝ LEFT PARENTHESIS LOWER HOOK ⎞⎞ RIGHT PARENTHESIS UPPER HOOK ⎟⎟ RIGHT PARENTHESIS EXTENSION + ⎠⎠ RIGHT PARENTHESIS LOWER HOOK ⎡⎡ LEFT SQUARE BRACKET UPPER CORNER ⎢⎢ LEFT SQUARE BRACKET EXTENSION + ⎣⎣ LEFT SQUARE BRACKET LOWER CORNER ⎤⎤ RIGHT SQUARE BRACKET UPPER CORNER ⎥⎥ RIGHT SQUARE BRACKET EXTENSION + ⎦⎦ RIGHT SQUARE BRACKET LOWER CORNER + ⎧⎧ LEFT CURLY BRACKET UPPER HOOK + ⎨⎨ LEFT CURLY BRACKET MIDDLE PIECE + ⎩⎩ LEFT CURLY BRACKET LOWER HOOK + ⎪⎪⎪⎪ CURLY BRACKET EXTENSION + ⎫⎫ RIGHT CURLY BRACKET UPPER HOOK + ⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE + ⎭⎭ RIGHT CURLY BRACKET LOWER HOOK ✓✓ CHECK MARK ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.in b/regress/usr.bin/mandoc/char/unicode/nogroff.in index 3d530040746..924e756d44f 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.in +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.in @@ -22,15 +22,10 @@ BEGINTEST \[u009E]\N'158' PRIVACY MESSAGE \[u009F]\N'159' APPLICATION PROGRAM COMMAND \[u2022]\(bu BULLET -\[u203E]\(rl OVERLINE \[u2243]\(-~ ASYMPTOTICALLY EQUAL TO \[u224C]\(~= ALL EQUAL TO \[u226A]\(<< MUCH LESS-THAN \[u226B]\(>> MUCH GREATER-THAN -\[u239D]\[parenleftbp] LEFT PARENTHESIS LOWER HOOK -\[u23A0]\[parenrightbp] RIGHT PARENTHESIS LOWER HOOK -\[u23A3]\[bracketleftbp] LEFT SQUARE BRACKET LOWER CORNER -\[u23A6]\[bracketrightbp] RIGHT SQUARE BRACKET LOWER CORNER \[u23A7]\(lt LEFT CURLY BRACKET UPPER HOOK \[u23A8]\(lk LEFT CURLY BRACKET MIDDLE PIECE \[u23A9]\(lb LEFT CURLY BRACKET LOWER HOOK diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii b/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii index 27765abb25b..fb156a44f07 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_ascii @@ -25,15 +25,10 @@ DDEESSCCRRIIPPTTIIOONN <9E><9E> PRIVACY MESSAGE <9F><9F> APPLICATION PROGRAM COMMAND +o+o BULLET - -- OVERLINE -~-~ ASYMPTOTICALLY EQUAL TO ~=~= ALL EQUAL TO <<<< MUCH LESS-THAN >>>> MUCH GREATER-THAN - \\ LEFT PARENTHESIS LOWER HOOK - // RIGHT PARENTHESIS LOWER HOOK - || LEFT SQUARE BRACKET LOWER CORNER - || RIGHT SQUARE BRACKET LOWER CORNER ,-,- LEFT CURLY BRACKET UPPER HOOK {{ LEFT CURLY BRACKET MIDDLE PIECE `-`- LEFT CURLY BRACKET LOWER HOOK diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html index 04a397ef494..677dd84b318 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html @@ -17,15 +17,10 @@ BEGINTEST
�� <control> PRIVACY MESSAGE
�� <control> APPLICATION PROGRAM COMMAND
•• BULLET
-‾‾ OVERLINE
≃≃ ASYMPTOTICALLY EQUAL TO
≌≌ ALL EQUAL TO
≪≪ MUCH LESS-THAN
≫≫ MUCH GREATER-THAN
-⎝⎝ LEFT PARENTHESIS LOWER HOOK
-⎠⎠ RIGHT PARENTHESIS LOWER HOOK
-⎣⎣ LEFT SQUARE BRACKET LOWER CORNER
-⎦⎦ RIGHT SQUARE BRACKET LOWER CORNER
⎧⎧ LEFT CURLY BRACKET UPPER HOOK
⎨⎨ LEFT CURLY BRACKET MIDDLE PIECE
⎩⎩ LEFT CURLY BRACKET LOWER HOOK
diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 b/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 index ed7cf99bc23..748099ebdeb 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_utf8 @@ -25,15 +25,10 @@ DDEESSCCRRIIPPTTIIOONN �� PRIVACY MESSAGE �� APPLICATION PROGRAM COMMAND •• BULLET - ‾‾ OVERLINE ≃≃ ASYMPTOTICALLY EQUAL TO ≌≌ ALL EQUAL TO ≪≪ MUCH LESS-THAN ≫≫ MUCH GREATER-THAN - ⎝⎝ LEFT PARENTHESIS LOWER HOOK - ⎠⎠ RIGHT PARENTHESIS LOWER HOOK - ⎣⎣ LEFT SQUARE BRACKET LOWER CORNER - ⎦⎦ RIGHT SQUARE BRACKET LOWER CORNER ⎧⎧ LEFT CURLY BRACKET UPPER HOOK ⎨⎨ LEFT CURLY BRACKET MIDDLE PIECE ⎩⎩ LEFT CURLY BRACKET LOWER HOOK diff --git a/share/man/man7/mandoc_char.7 b/share/man/man7/mandoc_char.7 index 43f1abe6c3d..d27e28221ca 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.20 2013/12/26 17:23:31 schwarze Exp $ +.\" $OpenBSD: mandoc_char.7,v 1.21 2014/12/15 19:41:24 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 26 2013 $ +.Dd $Mdocdate: December 15 2014 $ .Dt MANDOC_CHAR 7 .Os .Sh NAME @@ -210,7 +210,7 @@ Lines: .It \e(ba Ta \(ba Ta bar .It \e(br Ta \(br Ta box rule .It \e(ul Ta \(ul Ta underscore -.It \e(rl Ta \(rl Ta overline +.It \e(rn Ta \(rn Ta overline .It \e(bb Ta \(bb Ta broken bar .It \e(sl Ta \(sl Ta forward slash .It \e(rs Ta \(rs Ta backward slash @@ -273,7 +273,7 @@ Quotes: .El .Pp Brackets: -.Bl -column "xxbracketrightbpx" Rendered Description -offset indent -compact +.Bl -column "xxbracketrightbtx" Rendered Description -offset indent -compact .It Em Input Ta Em Rendered Ta Em Description .It \e(lB Ta \(lB Ta left bracket .It \e(rB Ta \(rB Ta right bracket @@ -284,30 +284,30 @@ Brackets: .It \e(bv Ta \(bv Ta brace extension .It \e[braceex] Ta \[braceex] Ta brace extension .It \e[bracketlefttp] Ta \[bracketlefttp] Ta top-left hooked bracket -.It \e[bracketleftbp] Ta \[bracketleftbp] Ta bottom-left hooked bracket +.It \e[bracketleftbt] Ta \[bracketleftbt] Ta bottom-left hooked bracket .It \e[bracketleftex] Ta \[bracketleftex] Ta left hooked bracket extension .It \e[bracketrighttp] Ta \[bracketrighttp] Ta top-right hooked bracket -.It \e[bracketrightbp] Ta \[bracketrightbp] Ta bottom-right hooked bracket +.It \e[bracketrightbt] Ta \[bracketrightbt] Ta bottom-right hooked bracket .It \e[bracketrightex] Ta \[bracketrightex] Ta right hooked bracket extension .It \e(lt Ta \(lt Ta top-left hooked brace .It \e[bracelefttp] Ta \[bracelefttp] Ta top-left hooked brace .It \e(lk Ta \(lk Ta mid-left hooked brace .It \e[braceleftmid] Ta \[braceleftmid] Ta mid-left hooked brace .It \e(lb Ta \(lb Ta bottom-left hooked brace -.It \e[braceleftbp] Ta \[braceleftbp] Ta bottom-left hooked brace +.It \e[braceleftbt] Ta \[braceleftbt] Ta bottom-left hooked brace .It \e[braceleftex] Ta \[braceleftex] Ta left hooked brace extension .It \e(rt Ta \(rt Ta top-left hooked brace .It \e[bracerighttp] Ta \[bracerighttp] Ta top-right hooked brace .It \e(rk Ta \(rk Ta mid-right hooked brace .It \e[bracerightmid] Ta \[bracerightmid] Ta mid-right hooked brace .It \e(rb Ta \(rb Ta bottom-right hooked brace -.It \e[bracerightbp] Ta \[bracerightbp] Ta bottom-right hooked brace +.It \e[bracerightbt] Ta \[bracerightbt] Ta bottom-right hooked brace .It \e[bracerightex] Ta \[bracerightex] Ta right hooked brace extension .It \e[parenlefttp] Ta \[parenlefttp] Ta top-left hooked parenthesis -.It \e[parenleftbp] Ta \[parenleftbp] Ta bottom-left hooked parenthesis +.It \e[parenleftbt] Ta \[parenleftbt] Ta bottom-left hooked parenthesis .It \e[parenleftex] Ta \[parenleftex] Ta left hooked parenthesis extension .It \e[parenrighttp] Ta \[parenrighttp] Ta top-right hooked parenthesis -.It \e[parenrightbp] Ta \[parenrightbp] Ta bottom-right hooked parenthesis +.It \e[parenrightbt] Ta \[parenrightbt] Ta bottom-right hooked parenthesis .It \e[parenrightex] Ta \[parenrightex] Ta right hooked parenthesis extension .El .Pp diff --git a/usr.bin/mandoc/chars.in b/usr.bin/mandoc/chars.in index 85e55fd4a12..fe5fb0fdf25 100644 --- a/usr.bin/mandoc/chars.in +++ b/usr.bin/mandoc/chars.in @@ -1,4 +1,4 @@ -/* $OpenBSD: chars.in,v 1.25 2014/11/06 22:27:52 schwarze Exp $ */ +/* $OpenBSD: chars.in,v 1.26 2014/12/15 19:41:24 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -91,30 +91,30 @@ CHAR("ra", ">", 10217) CHAR("bv", "|", 9130) CHAR("braceex", "|", 9130) CHAR("bracketlefttp", "|", 9121) -CHAR("bracketleftbp", "|", 9123) +CHAR("bracketleftbt", "|", 9123) CHAR("bracketleftex", "|", 9122) CHAR("bracketrighttp", "|", 9124) -CHAR("bracketrightbp", "|", 9126) +CHAR("bracketrightbt", "|", 9126) CHAR("bracketrightex", "|", 9125) CHAR("lt", ",-", 9127) CHAR("bracelefttp", ",-", 9127) CHAR("lk", "{", 9128) CHAR("braceleftmid", "{", 9128) CHAR("lb", "`-", 9129) -CHAR("braceleftbp", "`-", 9129) +CHAR("braceleftbt", "`-", 9129) CHAR("braceleftex", "|", 9130) CHAR("rt", "-.", 9131) CHAR("bracerighttp", "-.", 9131) CHAR("rk", "}", 9132) CHAR("bracerightmid", "}", 9132) CHAR("rb", "-\'", 9133) -CHAR("bracerightbp", "-\'", 9133) +CHAR("bracerightbt", "-\'", 9133) CHAR("bracerightex", "|", 9130) CHAR("parenlefttp", "/", 9115) -CHAR("parenleftbp", "\\", 9117) +CHAR("parenleftbt", "\\", 9117) CHAR("parenleftex", "|", 9116) CHAR("parenrighttp", "\\", 9118) -CHAR("parenrightbp", "/", 9120) +CHAR("parenrightbt", "/", 9120) CHAR("parenrightex", "|", 9119) /* Greek characters. */ @@ -357,7 +357,7 @@ CHAR("Fn", ",\bf", 402) CHAR("ba", "|", 124) CHAR("br", "|", 9474) CHAR("ul", "_", 95) -CHAR("rl", "-", 8254) +CHAR("rn", "-", 8254) CHAR("bb", "|", 166) CHAR("sl", "/", 47) CHAR("rs", "\\", 92) -- 2.20.1