2 files changed, 67 insertions, 15 deletions

diff --git a/chars.in b/chars.in
index 04218bdf..c5aebe7d 100644
--- a/chars.in
+++ b/chars.in
@@ -96,21 +96,21 @@ CHAR("*W",			2,	"O",		1,	"Ω",	6)
 CHAR("*X",			2,	"X",		1,	"Χ",	6)
 CHAR("*Y",			2,	"H",		1,	"Η",	6)
 CHAR("*Z",			2,	"Z",		1,	"Ζ",	6)
-CHAR("*a",			2,	"a",		1,	"α",	0)
-CHAR("*b",			2,	"B",		1,	"β",	0)
-CHAR("*c",			2,	"E",		1,	"ξ",	0)
-CHAR("*d",			2,	"d",		1,	"δ",	0)
-CHAR("*e",			2,	"e",		1,	"ε",	0)
-CHAR("*f",			2,	"o",		1,	"ϕ",	0)
-CHAR("*g",			2,	"y",		1,	"α",	0)
-CHAR("*h",			2,	"0",		1,	"θ",	0)
-CHAR("*i",			2,	"i",		1,	"ι",	0)
-CHAR("*k",			2,	"k",		1,	"κ",	0)
-CHAR("*l",			2,	"\\",		1,	"λ",	0)
-CHAR("*m",			2,	"u",		1,	"μ",	0)
-CHAR("*n",			2,	"v",		1,	"ν",	0)
-CHAR("*o",			2,	"o",		1,	"ο",	0)
-CHAR("*p",			2,	"n",		1,	"π",	0)
+CHAR("*a",			2,	"a",		1,	"α",	6)
+CHAR("*b",			2,	"B",		1,	"β",	6)
+CHAR("*c",			2,	"E",		1,	"ξ",	6)
+CHAR("*d",			2,	"d",		1,	"δ",	6)
+CHAR("*e",			2,	"e",		1,	"ε",	6)
+CHAR("*f",			2,	"o",		1,	"ϕ",	6)
+CHAR("*g",			2,	"y",		1,	"α",	6)
+CHAR("*h",			2,	"0",		1,	"θ",	6)
+CHAR("*i",			2,	"i",		1,	"ι",	6)
+CHAR("*k",			2,	"k",		1,	"κ",	6)
+CHAR("*l",			2,	"\\",		1,	"λ",	6)
+CHAR("*m",			2,	"u",		1,	"μ",	6)
+CHAR("*n",			2,	"v",		1,	"ν",	6)
+CHAR("*o",			2,	"o",		1,	"ο",	6)
+CHAR("*p",			2,	"n",		1,	"π",	6)
 CHAR("*q",			2,	"u",		1,	"",	0)
 CHAR("*r",			2,	"p",		1,	"",	0)
 CHAR("*s",			2,	"o",		1,	"",	0)
diff --git a/mandoc_char.7 b/mandoc_char.7
index 24bb4e34..98de4a52 100644
--- a/mandoc_char.7
+++ b/mandoc_char.7
@@ -460,108 +460,160 @@ Monetary:
 Greek letters:
 .Bl -tag -width Ds -offset indent -compact
 .It \e(*A
+\(*A
 .Pq Alpha
 .It \e(*B
+\(*B
 .Pq Beta
 .It \e(*C
+\(*C
 .Pq Xi
 .It \e(*D
+\(*D
 .Pq Delta
 .It \e(*E
+\(*E
 .Pq Epsilon
 .It \e(*F
+\(*F
 .Pq Phi
 .It \e(*G
+\(*G
 .Pq Gamma
 .It \e(*H
+\(*H
 .Pq Theta
 .It \e(*I
+\(*I
 .Pq Iota
 .It \e(*K
+\(*K
 .Pq Kappa
 .It \e(*L
+\(*L
 .Pq Lambda
 .It \e(*M
+\(*M
 .Pq Mu
 .It \e(*N
+\(*N
 .Pq Nu
 .It \e(*O
+\(*O
 .Pq Omicron
 .It \e(*P
+\(*P
 .Pq Pi
 .It \e(*Q
+\(*Q
 .Pq Psi
 .It \e(*R
+\(*R
 .Pq Rho
 .It \e(*S
+\(*S
 .Pq Sigma
 .It \e(*T
+\(*T
 .Pq Tau
 .It \e(*U
+\(*U
 .Pq Upsilon
 .It \e(*W
+\(*W
 .Pq Omega
 .It \e(*X
+\(*X
 .Pq Chi
 .It \e(*Y
+\(*Y
 .Pq Eta
 .It \e(*Z
+\(*Z
 .Pq Zeta
 .It \e(*a
+\(*a
 .Pq alpha
 .It \e(*b
+\(*b
 .Pq beta
 .It \e(*c
+\(*c
 .Pq xi
 .It \e(*d
+\(*d
 .Pq delta
 .It \e(*e
+\(*e
 .Pq epsilon
 .It \e(*f
+\(*f
 .Pq phi
 .It \e(+f
+\(+f
 .Pq phi variant
 .It \e(*g
+\(*g
 .Pq gamma
 .It \e(*h
+\(*h
 .Pq theta
 .It \e(+h
+\(*+
 .Pq theta variant
 .It \e(*i
+\(*i
 .Pq iota
 .It \e(*k
+\(*k
 .Pq kappa
 .It \e(*l
+\(*l
 .Pq lambda
 .It \e(*m
+\(*m
 .Pq mu
 .It \e(*n
+\(*n
 .Pq nu
 .It \e(*o
+\(*o
 .Pq omicron
 .It \e(*p
+\(*p
 .Pq pi
 .It \e(+p
+\(+p
 .Pq pi variant
 .It \e(*q
+\(*q
 .Pq psi
 .It \e(*r
+\(*r
 .Pq rho
 .It \e(*s
+\(*s
 .Pq sigma
 .It \e(*t
+\(*t
 .Pq tau
 .It \e(*u
+\(*u
 .Pq upsilon
 .It \e(*w
+\(*w
 .Pq omega
 .It \e(*x
+\(*x
 .Pq chi
 .It \e(*y
+\(*y
 .Pq eta
 .It \e(*z
+\(*z
 .Pq zeta
 .It \e(ts
+\(ts
 .Pq sigma terminal
 .El
 .\" PARAGRAPH