summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2009-07-13 00:18:13 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2009-07-13 00:18:13 +0000
commite066f1f4d1ab5bc78c0b3b47e9a75a563308592c (patch)
tree43dc63cf2aa7ead0dd83bc23469f672a0a32c193
parentd6e1452c77c0bb7d57883834f920672df6cc85c3 (diff)
sync to 1.7.24: support \(hy for groff compatibility
(even though it's useless, unescaped "-" is just the same)
-rw-r--r--usr.bin/mandoc/ascii.in3
-rw-r--r--usr.bin/mandoc/mandoc_char.78
2 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/mandoc/ascii.in b/usr.bin/mandoc/ascii.in
index 5dd1f721449..40f190da2e0 100644
--- a/usr.bin/mandoc/ascii.in
+++ b/usr.bin/mandoc/ascii.in
@@ -1,4 +1,4 @@
-/* $Id: ascii.in,v 1.3 2009/06/15 01:36:23 schwarze Exp $ */
+/* $Id: ascii.in,v 1.4 2009/07/13 00:18:12 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -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/usr.bin/mandoc/mandoc_char.7 b/usr.bin/mandoc/mandoc_char.7
index e0067b8774c..c64f31dcc74 100644
--- a/usr.bin/mandoc/mandoc_char.7
+++ b/usr.bin/mandoc/mandoc_char.7
@@ -1,4 +1,4 @@
-.\" $Id: mandoc_char.7,v 1.3 2009/06/15 01:36:23 schwarze Exp $
+.\" $Id: mandoc_char.7,v 1.4 2009/07/13 00:18:12 schwarze Exp $
.\"
.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
.\"
@@ -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 15 2009 $
+.Dd $Mdocdate: July 13 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