===================================================================
RCS file: /cvs/mandoc/mandoc_char.7,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- mandoc/mandoc_char.7	2009/04/12 19:45:26	1.4
+++ mandoc/mandoc_char.7	2009/07/27 12:02:49	1.9
@@ -1,6 +1,6 @@
-.\"	$Id: mandoc_char.7,v 1.4 2009/04/12 19:45:26 kristaps Exp $
+.\"	$Id: mandoc_char.7,v 1.9 2009/07/27 12:02:49 kristaps Exp $
 .\"
-.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -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: April 12 2009 $
+.Dd $Mdocdate: July 27 2009 $
 .Dt MANDOC_CHAR 7
 .Os
 .\" SECTION
@@ -39,16 +39,44 @@ Both
 .Xr mdoc 7
 and
 .Xr man 7
-encode special characters with slightly different semantics; consult the
-respective manuals for these escapes.
+encode these special characters with 
+.Sq \eX
+.Pq for a one-character escape ,
+.Sq \e(XX
+.Pq two-character ,
+and
+.Sq \e[N]
+.Pq N-character .
+One may generalise
+.Sq \e(XX
+as
+.Sq \e[XX] .
+.\" PARAGRAPH
 .Pp
+Typographic:
+.Bl -tag -width Ds -offset indent -compact
+.It \e~
+.Pq non-breaking space
+.It \e
+.Pq space
+.It \e^
+.Pq zero-width space
+.It \e%
+.Pq zero-width space
+.It \e&
+.Pq zero-width space
+.It \e|
+.Pq zero-width space
+.El
+.\" PARAGRAPH
+.Pp
 Grammatic:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(em
 .Pq em-dash
 .It \e(en
 .Pq en-dash
-.It \e-
+.It \e(hy
 .Pq hyphen
 .It \e\e
 .Pq back-slash
@@ -56,8 +84,6 @@ Grammatic:
 .Pq apostrophe
 .It \e`
 .Pq back-tick
-.It \e
-.Pq space
 .It \e.
 .Pq period
 .It \e(r!
@@ -68,7 +94,7 @@ Grammatic:
 .\" PARAGRAPH
 .Pp
 Enclosures:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(lh
 .Pq left hand
 .It \e(rh
@@ -97,12 +123,8 @@ Enclosures:
 .Pq double-quote
 .It \e(lq
 .Pq left double-quote
-.It \e(Lq
-.Pq left double-quote, deprecated
 .It \e(rq
 .Pq right double-quote
-.It \e(Rq
-.Pq right double-quote, deprecated
 .It \e(oq
 .Pq left single-quote
 .It \e(aq
@@ -115,7 +137,7 @@ Enclosures:
 .\" PARAGRAPH
 .Pp
 Indicatives:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(<-
 .Pq left arrow
 .It \e(->
@@ -140,7 +162,7 @@ Indicatives:
 .\" PARAGRAPH
 .Pp
 Mathematical:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(es
 .Pq empty set
 .It \e(ca
@@ -165,6 +187,8 @@ Mathematical:
 .Pq multiplication
 .It \e(pl
 .Pq addition
+.It \e-
+.Pq subtraction
 .It \e(nm
 .Pq not element
 .It \e(mo
@@ -195,43 +219,27 @@ Mathematical:
 .Pq approximately equals
 .It \e(=~
 .Pq congruent
-.It \e(Gt
-.Pq greater-than, deprecated
-.It \e(Lt
-.Pq less-than, deprecated
 .It \e(<=
 .Pq less-than-equal
-.It \e(Le
-.Pq less-than-equal, deprecated
 .It \e(>=
 .Pq greater-than-equal
-.It \e(Ge
-.Pq greater-than-equal
 .It \e(==
 .Pq equal
 .It \e(!=
 .Pq not equal
-.It \e(Ne
-.Pq not equal, deprecated
 .It \e(if
 .Pq infinity
-.It \e(If
-.Pq infinity, deprecated
 .It \e(na
 .Pq NaN , an extension
-.It \e(Na
-.Pq NaN, deprecated
 .It \e(+-
 .Pq plus-minus
-.It \e(Pm
-.Pq plus-minus, deprecated
 .It \e(**
 .Pq asterisk
 .El
 .\" PARAGRAPH
 .Pp
 Ligatures:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(ss
 .Pq German eszett
 .It \e(AE
@@ -256,7 +264,7 @@ Ligatures:
 .\" PARAGRAPH
 .Pp
 Diacritics and letters:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(ga
 .Pq grave accent
 .It \e(aa
@@ -405,7 +413,7 @@ Diacritics and letters:
 .\" PARAGRAPH
 .Pp
 Monetary:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(Cs
 .Pq Scandinavian
 .It \e(Do
@@ -422,7 +430,7 @@ Monetary:
 .\" PARAGRAPH
 .Pp
 Special symbols:
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e0
 .Pq white-space
 .It \e(de
@@ -441,20 +449,14 @@ Special symbols:
 .Pq bar
 .It \e(bb
 .Pq broken bar
-.It \e(Ba
-.Pq bar, deprecated
 .It \e(co
 .Pq copyright
 .It \e(rg
 .Pq registered
 .It \e(tm
 .Pq trademarked
-.It \e&
-.Pq non-breaking space
 .It \ee
 .Pq escape
-.It \e(Am
-.Pq ampersand, deprecated
 .El 
 .\" SECTION
 .Sh COMPATIBILITY
@@ -463,7 +465,7 @@ This section documents compatibility of
 with older or existing versions of
 .Xr groff 1 :
 .Pp
-.Bl -tag -width 12n -offset "XXXX" -compact
+.Bl -tag -width Ds -offset indent -compact
 .It \e(ss
 Renders differently in
 .Fl T Ns Ar ascii
@@ -477,4 +479,4 @@ mode.
 The
 .Nm
 utility was written by 
-.An Kristaps Dzonsons Aq kristaps@openbsd.org .
+.An Kristaps Dzonsons Aq kristaps@kth.se .