From f04548a18a8220e3ca4c1aa97474aefc4b800b55 Mon Sep 17 00:00:00 2001 From: schwarze Date: Wed, 14 Jun 2017 20:56:42 +0000 Subject: [PATCH] add the \(ru (0.5m baseline ruler) character escape sequence, abused by mail/nmh; groff_char(7) confirms that this really exists --- regress/usr.bin/mandoc/char/unicode/ascii.in | 2 +- regress/usr.bin/mandoc/char/unicode/ascii.out_ascii | 2 +- regress/usr.bin/mandoc/char/unicode/ascii.out_html | 2 +- regress/usr.bin/mandoc/char/unicode/ascii.out_utf8 | 2 +- share/man/man7/mandoc_char.7 | 5 +++-- usr.bin/mandoc/chars.c | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/regress/usr.bin/mandoc/char/unicode/ascii.in b/regress/usr.bin/mandoc/char/unicode/ascii.in index c75da2c05da..66664155cb8 100644 --- a/regress/usr.bin/mandoc/char/unicode/ascii.in +++ b/regress/usr.bin/mandoc/char/unicode/ascii.in @@ -18,7 +18,7 @@ BEGINTEST \[u005C]\N'92'\e\(rs REVERSE SOLIDUS \[u005D]\N'93'\(rB RIGHT SQUARE BRACKET \[u005E]\N'94'\(a^\(ha CIRCUMFLEX ACCENT -\[u005F]\N'95'\(ul LOW LINE +\[u005F]\N'95'\(ul\(ru LOW LINE \[u0060]\N'96'\`\(ga GRAVE ACCENT \[u007B]\N'123'\(lC LEFT CURLY BRACKET \[u007C]\N'124'\(ba\(or VERTICAL LINE diff --git a/regress/usr.bin/mandoc/char/unicode/ascii.out_ascii b/regress/usr.bin/mandoc/char/unicode/ascii.out_ascii index 74b5d2861d1..f46e0f367e5 100644 --- a/regress/usr.bin/mandoc/char/unicode/ascii.out_ascii +++ b/regress/usr.bin/mandoc/char/unicode/ascii.out_ascii @@ -21,7 +21,7 @@ DDEESSCCRRIIPPTTIIOONN \\\\ REVERSE SOLIDUS ]]] RIGHT SQUARE BRACKET ^^^^ CIRCUMFLEX ACCENT - ___ LOW LINE + ____ LOW LINE ```` GRAVE ACCENT {{{ LEFT CURLY BRACKET |||| VERTICAL LINE diff --git a/regress/usr.bin/mandoc/char/unicode/ascii.out_html b/regress/usr.bin/mandoc/char/unicode/ascii.out_html index deef5bcbf37..7ebda578849 100644 --- a/regress/usr.bin/mandoc/char/unicode/ascii.out_html +++ b/regress/usr.bin/mandoc/char/unicode/ascii.out_html @@ -13,7 +13,7 @@ $$$ DOLLAR SIGN \\\\ REVERSE SOLIDUS ]]] RIGHT SQUARE BRACKET ^^^^ CIRCUMFLEX ACCENT -___ LOW LINE +____ LOW LINE ```` GRAVE ACCENT {{{ LEFT CURLY BRACKET |||| VERTICAL LINE diff --git a/regress/usr.bin/mandoc/char/unicode/ascii.out_utf8 b/regress/usr.bin/mandoc/char/unicode/ascii.out_utf8 index 74b5d2861d1..f46e0f367e5 100644 --- a/regress/usr.bin/mandoc/char/unicode/ascii.out_utf8 +++ b/regress/usr.bin/mandoc/char/unicode/ascii.out_utf8 @@ -21,7 +21,7 @@ DDEESSCCRRIIPPTTIIOONN \\\\ REVERSE SOLIDUS ]]] RIGHT SQUARE BRACKET ^^^^ CIRCUMFLEX ACCENT - ___ LOW LINE + ____ LOW LINE ```` GRAVE ACCENT {{{ LEFT CURLY BRACKET |||| VERTICAL LINE diff --git a/share/man/man7/mandoc_char.7 b/share/man/man7/mandoc_char.7 index e488a5e06bf..ff171435ad1 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.31 2017/06/02 12:41:28 schwarze Exp $ +.\" $OpenBSD: mandoc_char.7,v 1.32 2017/06/14 20:56:42 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: June 2 2017 $ +.Dd $Mdocdate: June 14 2017 $ .Dt MANDOC_CHAR 7 .Os .Sh NAME @@ -260,6 +260,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(ru Ta \(ru Ta underscore (width 0.5m) .It \e(rn Ta \(rn Ta overline .It \e(bb Ta \(bb Ta broken bar .It \e(sl Ta \(sl Ta forward slash diff --git a/usr.bin/mandoc/chars.c b/usr.bin/mandoc/chars.c index 2d174a5ecd2..13bb663a3a0 100644 --- a/usr.bin/mandoc/chars.c +++ b/usr.bin/mandoc/chars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chars.c,v 1.40 2017/06/02 12:41:28 schwarze Exp $ */ +/* $OpenBSD: chars.c,v 1.41 2017/06/14 20:56:42 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze @@ -59,6 +59,7 @@ static struct ln lines[] = { { "ba", "|", 0x007c }, { "br", "|", 0x2502 }, { "ul", "_", 0x005f }, + { "ru", "_", 0x005f }, { "rn", "-", 0x203e }, { "bb", "|", 0x00a6 }, { "sl", "/", 0x002f }, -- 2.20.1