From f3d3e53ced24d5eca5ddd302b0b4a32c119728bc Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 12 Jul 2009 08:45:56 +0000 Subject: [PATCH] Added \(hy symbol. Properly categorised \- as an arithmetic minus sign. Nd produces \(em instead of old \-. OpenBSD ifdef'd to use old \- after Nd (ok: jmc@openbsd.org). --- ascii.in | 3 ++- mandoc_char.7 | 8 +++++--- mdoc_term.c | 6 +++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ascii.in b/ascii.in index 4b819a8a..7a4bc078 100644 --- a/ascii.in +++ b/ascii.in @@ -1,4 +1,4 @@ -/* $Id: ascii.in,v 1.10 2009/06/10 20:18:43 kristaps Exp $ */ +/* $Id: ascii.in,v 1.11 2009/07/12 08:45:56 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -87,6 +87,7 @@ LINE("a~", 2, "~", 1) LINE("ga", 2, "`", 1) LINE("en", 2, "-", 1) LINE("em", 2, "--", 2) +LINE("hy", 2, "-", 1) LINE("Pi", 2, "pi", 2) LINE("Fo", 2, "<<", 2) LINE("Fc", 2, ">>", 2) diff --git a/mandoc_char.7 b/mandoc_char.7 index aa38504d..c6aebeea 100644 --- a/mandoc_char.7 +++ b/mandoc_char.7 @@ -1,4 +1,4 @@ -.\" $Id: mandoc_char.7,v 1.6 2009/06/11 07:26:35 kristaps Exp $ +.\" $Id: mandoc_char.7,v 1.7 2009/07/12 08:45:56 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,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 11 2009 $ +.Dd $Mdocdate: July 12 2009 $ .Dt MANDOC_CHAR 7 .Os .\" SECTION @@ -48,7 +48,7 @@ Grammatic: .Pq em-dash .It \e(en .Pq en-dash -.It \e- +.It \e(hy .Pq hyphen .It \e\e .Pq back-slash @@ -165,6 +165,8 @@ Mathematical: .Pq multiplication .It \e(pl .Pq addition +.It \e- +.Pq subtraction .It \e(nm .Pq not element .It \e(mo diff --git a/mdoc_term.c b/mdoc_term.c index 8e4db782..cecdb9ce 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.22 2009/07/07 11:47:17 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.23 2009/07/12 08:45:56 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -1135,7 +1135,11 @@ static int termp_nd_pre(DECL_ARGS) { +#ifdef __OpenBSD__ term_word(p, "\\-"); +#else + term_word(p, "\\(em"); +#endif return(1); } -- 2.47.1