* font/devlj4/generate/Makefile (SYMBOL): Use 9nb28703.tfm.

* font/devlj4/generate/wingdings.map,
font/devlj4/generate/symbol.map: Include unnamed glyphs.
Use groff glyph names where possible.
* src/devices/lj4_font.man: Minor updates.

5 files changed, 444 insertions, 329 deletions

diff --git a/ChangeLog b/ChangeLog
index ec4cee48..80b65e1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-17  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devlj4/generate/Makefile (SYMBOL): Use 9nb28703.tfm.
+
+2004-01-16  Jeff Conrad  <jeff_conrad@msn.com>
+
+	* font/devlj4/generate/wingdings.map,
+	font/devlj4/generate/symbol.map: Include unnamed glyphs.
+	Use groff glyph names where possible.
+	* src/devices/lj4_font.man: Minor updates.
+
 2004-01-13  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/www.tmac (DC): Handle TTY devices.
diff --git a/font/devlj4/generate/Makefile b/font/devlj4/generate/Makefile
index e7454cf9..0f8b7aa6 100644
--- a/font/devlj4/generate/Makefile
+++ b/font/devlj4/generate/Makefile
@@ -24,8 +24,9 @@
 #
 # This is a self-extracting MS-DOS archive (in ZIP format).
 #
-# Metric files for the Arial and Times New Roman families have been
-# replaced with versions which have more glyphs and kerning pairs:
+# Metric files for the Arial and Times New Roman families and the Symbol
+# font have been replaced with versions which have more glyphs and/or
+# kerning pairs:
 #
 #   ftp://ftp.ffii.org/pub/groff/contrib/lj4/tfmlj4x.zip
 
@@ -245,8 +246,8 @@ ABI: $(AUTOFONT)/arlj000s.tfm $(TEXTMAP)
 	$(HPFTODIT) $(IFLAG) $(AUTOFONT)/arlj000s.tfm $(TEXTMAP) $@
 
 # Symbol
-SYMBOL: $(AUTOFONT)/9nb00078.tfm $(SYMBOLMAP)
-	$(HPFTODIT) $(AUTOFONT)/9nb00078.tfm $(SYMBOLMAP) $@
+SYMBOL: $(AUTOFONT)/9nb28703.tfm $(SYMBOLMAP)
+	$(HPFTODIT) $(AUTOFONT)/9nb28703.tfm $(SYMBOLMAP) $@
 
 # Wingdings
 WINGDINGS: $(AUTOFONT)/9nb00095.tfm $(WINGDINGSMAP)
diff --git a/font/devlj4/generate/symbol.map b/font/devlj4/generate/symbol.map
index b292e856..068a4f8f 100644
--- a/font/devlj4/generate/symbol.map
+++ b/font/devlj4/generate/symbol.map
@@ -2,198 +2,198 @@
 #
 # This font is TrueType only, so the MSL values are dummies.
 #
-# Created 12 January 2004.  Some mappings are taken from Alan Wood's
+# Created 16 January 2004.  Some mappings are taken from Alan Wood's
 # website (www.alanwood.net)
 #
 # You need hpftodit from groff 1.19.1 or newer!
 
-0	f021	!	# exclamation point
-0	f022	fa	# for all (u2200)
-0	f023	# sh	# number sign
-0	f024	te	# there exists (u2203)
-0	f025	%	# per cent
-0	f026	&	# ampersand
-0	f027	st	# such that, small contains as member (u220D)
-0	f028	(	# left parenthesis
-0	f029	)	# right parenthesis
-0	f02a	**	# math asterisk operator (u2217)
-0	f02b	pl	# plus
-0	f02c	,	# comma
-0	f02d	mi	# minus (- is hyphen) (u2212)
-0	f02e	.	# period
-0	f02f	/ sl	# solidus
-0	f030	0	# numeral 0
-0	f031	1	# numeral 1
-0	f032	2	# numeral 2
-0	f033	3	# numeral 3
-0	f034	4	# numeral 4
-0	f035	5	# numeral 5
-0	f036	6	# numeral 6
-0	f037	7	# numeral 7
-0	f038	8	# numeral 8
-0	f039	9	# numeral 9
-0	f03a	:	# colon
-0	f03b	;	# semicolon
-0	f03c	<	# less than
-0	f03d	=	# equals
-0	f03e	>	# greater than
-0	f03f	?	# question mark
-0	f040	=~	# approximately equal to, congruent (u2245)
-0	f041	*A	# capital Alpha (u0391)
-0	f042	*B	# capital Beta (u0392)
-0	f043	*X	# capital Chi (u03A7)
-0	f044	*D	# capital Delta (u0394)
-0	f045	*E	# capital Epsilon (u0395)
-0	f046	*F	# capital Phi (u03A6)
-0	f047	*G	# capital Gamma (u0393)
-0	f048	*Y	# capital Eta (u0397)
-0	f049	*I	# capital Iota (u0399)
-0	f04a	+h	# theta symbol (u03D1)
-0	f04b	*K	# capital Kappa (u039A)
-0	f04c	*L	# capital Lambda (u039B)
-0	f04d	*M	# capital Mu (u039C)
-0	f04e	*N	# capital Nu (u039D)
-0	f04f	*O	# capital Omicron (u039F)
-0	f050	*P	# capital Pi (u03A0)
-0	f051	*H	# capital Theta (u0398)
-0	f052	*R	# capital Rho (u03A1)
-0	f053	*S	# capital Sigma (u03A3)
-0	f054	*T	# capital Tau (u03A4)
-0	f055	*U	# capital Upsilon (u03A5)
-0	f056	ts	# lower case sigma (terminal) (u03C2)
-0	f057	*W	# capital Omega (u03A9)
-0	f058	*C	# capital Xi (u039E)
-0	f059	*Q	# capital Psi (u03A8)
-0	f05a	*Z	# capital Zeta (u0396)
-0	f05b	[ lB	# left bracket
-0	f05c	3d tf	# therefore (u2234)
-0	f05b	] rB	# right bracket
-0	f05e	pp	# perpendicular (u22A5)
-0	f05f	_	# underscore
-0	f060	---	# radical extender
-0	f061	*a	# lower case alpha (u03B1)
-0	f062	*b	# lower case beta (u03B2)
-0	f063	*x	# lower case chi (u03C7)
-0	f064	*d	# lower case delta (u03B4)
-0	f065	*e	# lower case epsilon (u03B5)
-0	f066	+f	# lower case phi (u03C6)
-0	f067	*g	# lower case gamma (u03B3)
-0	f068	*y	# lower case eta (u03B7)
-0	f069	*i	# lower case iota (u03B9)
-0	f06a	*f	# phi symbol (u03D5)
-0	f06b	*k	# lower case kappa (u03BA)
-0	f06c	*l	# lower case lambda (u03BB)
-0	f06d	*m	# lower case mu (u03BC)
-0	f06e	*n	# lower case nu (u03BD)
-0	f06f	*o	# lower case omicron (u03BF)
-0	f070	*p	# lower case pi (u03C0)
-0	f071	*h	# lower case theta (u03B8)
-0	f072	*r	# lower case rho (u03C1)
-0	f073	*s	# lower case sigma (u03C3)
-0	f074	*t	# lower case tau (u03C4)
-0	f075	*u	# lower case upsilon (u03C5)
-0	f076	+p	# pi symbol (u03D6)
-0	f077	*w	# lower case omega (u03C9)
-0	f078	*c	# lower case xi (u03BE)
-0	f079	*q	# lower case psi (u03C8)
-0	f07a	*z	# lower case zeta (u03B6)
-0	f07b	{ lC	# left brace
-0	f07c	| ba	# vertical bar
-0	f07d	} rC	# right brace
-0	f07e	u223C	# similar, tilde operator (u223C)
-0	f0a1	u03D2	# upsilon with hook symbol (u03D2)
-0	f0a2	fm	# prime or minutes or feet (u2032)
-0	f0a3	<=	# less than or equal to (u2264)
-0	f0a4	u2044	# figure slash (fraction) (/ is normal slash) (u2044)
-0	f0a5	if	# infinity (u221E)
-0	f0a6	u0192	# Florin or Guilder
-0	f0a7	CL	# clubs (u2663)
-0	f0a8	DI	# diamonds (u2666)
-0	f0a9	HE	# hearts (u2665)
-0	f0aa	SP	# spades (u2660)
-0	f0ab	<>	# arrow left and right (u2194)
-0	f0ac	<-	# arrow left (u2190)
-0	f0ad	ua	# arrow up (u2191)
-0	f0ae	->	# arrow right (u2192)
-0	f0af	da	# arrow down (u2193)
-0	f0b0	de	# degree
-0	f0b1	+-	# plus minus (u00B1)
-0	f0b2	sd	# double prime or seconds or inches (u2033)
-0	f0b3	>=	# greater than or equal to (u2265)
-0	f0b4	mu	# multiply (u00D7)
-0	f0b5	pt	# proportional (u221D)
-0	f0b6	pd	# partial derivative / partial differential (u2202)
-0	f0b7	u2219	# bullet operator (u2219)
-0	f0b8	di	# divide (u00F7)
-0	f0b9	!=	# not equal (u2260)
-0	f0ba	==	# equivalent (u2261)
-0	f0bb	~= ~~	# almost equal to, asymptotic to (u2248)
-0	f0bc	u2026	# ellipsis (u2026)
-0	f0bd	u23D0	# vertical arrow extender (u23D0)
-0	f0be	u23AF	# horizontal arrow extender (u23AF)
-0	f0bf	CR	# carriage return (u21B5)
-0	f0c0	Ah	# alef symbol (u2135)
-0	f0c1	Im	# I fraktur (u2111)
-0	f0c2	Re	# R fraktur (u211C)
-0	f0c3	wp	# Weierstrass (u2118)
-0	f0c4	c*	# circle multiply (u2297)
-0	f0c5	c+	# circle plus (u2295)
-0	f0c6	es	# empty set (u2205)
-0	f0c7	ca	# intersection (u2229)
-0	f0c8	cu	# union (u222A)
-0	f0c9	sp	# proper superset, superset of (u2283)
-0	f0ca	ip	# reflex superset (contains or equals), superset of or equal to (u2287)
-0	f0cb	nb	# not subset (u2284)
-0	f0cc	sb	# proper subset, subset of (u2282)
-0	f0cd	ib	# reflex subset (contained in or equals), subset of or equal to (u2286)
-0	f0ce	mo	# member (element) (u2208)
-0	f0cf	nm	# not a member (not an element) (u2209)
-0	f0d0	/_	# angle (u2220)
-0	f0d1	gr	# nabla or gradient (u2207)
-0	f0d2	---	# registered (serif) (u00AE)
-0	f0d3	---	# copyright (serif) (u00A9)
-0	f0d4	---	# trade mark (serif)
-0	f0d5	product	# product of (u220F)
-0	f0d6	u221A	# square root (u221A)
-0	f0d7	u22C5	# dot operator (u22C5)
-0	f0d8	no	# not (u00AC)
-0	f0d9	AN	# logical and (u2227)
-0	f0da	OR	# logical or (u2228)
-0	f0db	hA	# double arrow left and right (u21D4)
-0	f0dc	lA lh	# double arrow left (implied by) (u21D0)
-0	f0dd	arrowverttp uA	# double arrow up (u21D1)
-0	f0de	rA rh	# double arrow right (implies) (u21D2)
-0	f0df	arrowvertbt dA	# double arrow down (u21D3)
-0	f0e0	u25CA	# lozenge (u25CA)
-0	f0e1	la	# left angle bracket (< is less than) (u2329)
-0	f0e2	---	# registered (sans serif) (u00AE)
-0	f0e3	---	# copyright (sans serif) (u00A9)
-0	f0e4	---	# trade mark (sans serif)
-0	f0e5	sum	# sum of (u2211)
-0	f0e6	u239B	# composite left parenthesis (top) (u239B)
-0	f0e7	u239C	# composite left parenthesis (extender) (u239C)
-0	f0e8	u239D	# composite left parenthesis (bottom) (u239D)
-0	f0e9	u23A1	# composite left bracket (top) (u23A1)
-0	f0ea	u23A2	# composite left bracket (extender) (u23A2)
-0	f0eb	u23A3	# composite left bracket (bottom) (u23A3)
-0	f0ec	u23A7	# composite left brace (top) (u23A7)
-0	f0ed	u23A8	# composite left brace (middle) (u23A8)
-0	f0ee	u23A9	# composite left brace (bottom) (u23A9)
-0	f0ef	u23AA	# composite brace extender (u23AA)
-0	f0f0	Eu	# euro sign (u20AC)
-0	f0f1	ra	# right angle bracket (> is greater than) (u232A)
-0	f0f2	integral is	# integral (u222B)
-0	f0f3	u2320	# composite integral (top) (u2320)
-0	f0f4	u23AE	# composite integral extender (u23AE)
-0	f0f5	u2321	# composite integral (bottom) (u2321)
-0	f0f6	u239E	# composite right parenthesis (top) (u239E)
-0	f0f7	u239F	# composite right parenthesis (extender) (u239F)
-0	f0f8	u23A0	# composite right parenthesis (bottom) (u23A0)
-0	f0f9	u23A4	# composite right bracket (top) (u23A4)
-0	f0fa	u23A5	# composite right bracket (extender) (u23A5)
-0	f0fb	u23A6	# composite right bracket (bottom) (u23A6)
-0	f0fc	u23AB	# composite right brace (top) (u23AB)
-0	f0fd	u23AC	# composite right brace (middle) (u23AC)
-0	f0fe	u23AD	# composite right brace (bottom) (u23AD)
+-1	F021	!	# exclamation point
+-1	F022	fa	# for all (u2200)
+-1	F023	# sh	# number sign
+-1	F024	te	# there exists (u2203)
+-1	F025	%	# per cent
+-1	F026	&	# ampersand
+-1	F027	st	# such that, small contains as member (u220D)
+-1	F028	(	# left parenthesis
+-1	F029	)	# right parenthesis
+-1	F02A	**	# math asterisk operator (u2217)
+-1	F02B	pl	# plus
+-1	F02C	,	# comma
+-1	F02D	mi	# minus (- is hyphen) (u2212)
+-1	F02E	.	# period
+-1	F02F	/ sl	# solidus
+-1	F030	0	# numeral 0
+-1	F031	1	# numeral 1
+-1	F032	2	# numeral 2
+-1	F033	3	# numeral 3
+-1	F034	4	# numeral 4
+-1	F035	5	# numeral 5
+-1	F036	6	# numeral 6
+-1	F037	7	# numeral 7
+-1	F038	8	# numeral 8
+-1	F039	9	# numeral 9
+-1	F03A	:	# colon
+-1	F03B	;	# semicolon
+-1	F03C	<	# less than
+-1	F03D	=	# equals
+-1	F03E	>	# greater than
+-1	F03F	?	# question mark
+-1	F040	=~	# approximately equal to, congruent (u2245)
+-1	F041	*A	# capital Alpha (u0391)
+-1	F042	*B	# capital Beta (u0392)
+-1	F043	*X	# capital Chi (u03A7)
+-1	F044	*D	# capital Delta (u0394)
+-1	F045	*E	# capital Epsilon (u0395)
+-1	F046	*F	# capital Phi (u03A6)
+-1	F047	*G	# capital Gamma (u0393)
+-1	F048	*Y	# capital Eta (u0397)
+-1	F049	*I	# capital Iota (u0399)
+-1	F04A	+h	# theta symbol (u03D1)
+-1	F04B	*K	# capital Kappa (u039A)
+-1	F04C	*L	# capital Lambda (u039B)
+-1	F04D	*M	# capital Mu (u039C)
+-1	F04E	*N	# capital Nu (u039D)
+-1	F04F	*O	# capital Omicron (u039F)
+-1	F050	*P	# capital Pi (u03A0)
+-1	F051	*H	# capital Theta (u0398)
+-1	F052	*R	# capital Rho (u03A1)
+-1	F053	*S	# capital Sigma (u03A3)
+-1	F054	*T	# capital Tau (u03A4)
+-1	F055	*U	# capital Upsilon (u03A5)
+-1	F056	ts	# lower case sigma (terminal) (u03C2)
+-1	F057	*W	# capital Omega (u03A9)
+-1	F058	*C	# capital Xi (u039E)
+-1	F059	*Q	# capital Psi (u03A8)
+-1	F05A	*Z	# capital Zeta (u0396)
+-1	F05B	[ lB	# left bracket
+-1	F05C	3d tf	# therefore (u2234)
+-1	F05D	] rB	# right bracket
+-1	F05E	pp	# perpendicular (u22A5)
+-1	F05F	_	# underscore
+-1	F060	---	# radical extender
+-1	F061	*a	# lower case alpha (u03B1)
+-1	F062	*b	# lower case beta (u03B2)
+-1	F063	*x	# lower case chi (u03C7)
+-1	F064	*d	# lower case delta (u03B4)
+-1	F065	*e	# lower case epsilon (u03B5)
+-1	F066	+f	# lower case phi (stroked) (u03D5)
+-1	F067	*g	# lower case gamma (u03B3)
+-1	F068	*y	# lower case eta (u03B7)
+-1	F069	*i	# lower case iota (u03B9)
+-1	F06A	*f	# lower case phi (curly) (u03C6)
+-1	F06B	*k	# lower case kappa (u03BA)
+-1	F06C	*l	# lower case lambda (u03BB)
+-1	F06D	*m	# lower case mu (u03BC)
+-1	F06E	*n	# lower case nu (u03BD)
+-1	F06F	*o	# lower case omicron (u03BF)
+-1	F070	*p	# lower case pi (u03C0)
+-1	F071	*h	# lower case theta (u03B8)
+-1	F072	*r	# lower case rho (u03C1)
+-1	F073	*s	# lower case sigma (u03C3)
+-1	F074	*t	# lower case tau (u03C4)
+-1	F075	*u	# lower case upsilon (u03C5)
+-1	F076	+p	# pi symbol (u03D6)
+-1	F077	*w	# lower case omega (u03C9)
+-1	F078	*c	# lower case xi (u03BE)
+-1	F079	*q	# lower case psi (u03C8)
+-1	F07A	*z	# lower case zeta (u03B6)
+-1	F07B	{ lC	# left brace
+-1	F07C	| ba	# vertical bar
+-1	F07D	} rC	# right brace
+-1	F07E	ap	# similar, tilde operator (u223C)
+-1	F0A1	u03D2	# upsilon with hook symbol (u03D2)
+-1	F0A2	fm	# prime or minutes or feet (u2032)
+-1	F0A3	<=	# less than or equal to (u2264)
+-1	F0A4	f/	# figure slash (fraction) (/ is normal slash) (u2044)
+-1	F0A5	if	# infinity (u221E)
+-1	F0A6	u0192	# Florin or Guilder
+-1	F0A7	CL	# clubs (u2663)
+-1	F0A8	DI	# diamonds (u2666)
+-1	F0A9	HE	# hearts (u2665)
+-1	F0AA	SP	# spades (u2660)
+-1	F0AB	<>	# arrow left and right (u2194)
+-1	F0AC	<-	# arrow left (u2190)
+-1	F0AD	ua	# arrow up (u2191)
+-1	F0AE	->	# arrow right (u2192)
+-1	F0AF	da	# arrow down (u2193)
+-1	F0B0	de	# degree
+-1	F0B1	+-	# plus minus (u00B1)
+-1	F0B2	sd	# double prime or seconds or inches (u2033)
+-1	F0B3	>=	# greater than or equal to (u2265)
+-1	F0B4	mu	# multiply (u00D7)
+-1	F0B5	pt	# proportional (u221D)
+-1	F0B6	pd	# partial derivative / partial differential (u2202)
+-1	F0B7	u2219	# bullet operator (u2219)
+-1	F0B8	di	# divide (u00F7)
+-1	F0B9	!=	# not equal (u2260)
+-1	F0BA	==	# equivalent (u2261)
+-1	F0BB	~= ~~	# almost equal to, asymptotic to (u2248)
+-1	F0BC	u2026	# ellipsis (u2026)
+-1	F0BD	u23D0	# vertical arrow extender (u23D0)
+-1	F0BE	u23AF	# horizontal arrow extender (u23AF)
+-1	F0BF	CR	# carriage return (u21B5)
+-1	F0C0	Ah	# alef symbol (u2135)
+-1	F0C1	Im	# I fraktur (u2111)
+-1	F0C2	Re	# R fraktur (u211C)
+-1	F0C3	wp	# Weierstrass (u2118)
+-1	F0C4	c*	# circle multiply (u2297)
+-1	F0C5	c+	# circle plus (u2295)
+-1	F0C6	es	# empty set (u2205)
+-1	F0C7	ca	# intersection (u2229)
+-1	F0C8	cu	# union (u222A)
+-1	F0C9	sp	# proper superset, superset of (u2283)
+-1	F0CA	ip	# reflex superset (contains or equals), superset of or equal to (u2287)
+-1	F0CB	nb	# not subset (u2284)
+-1	F0CC	sb	# proper subset, subset of (u2282)
+-1	F0CD	ib	# reflex subset (contained in or equals), subset of or equal to (u2286)
+-1	F0CE	mo	# member (element) (u2208)
+-1	F0CF	nm	# not a member (not an element) (u2209)
+-1	F0D0	/_	# angle (u2220)
+-1	F0D1	gr	# nabla or gradient (u2207)
+-1	F0D2	---	# registered (serif) (u00AE)
+-1	F0D3	---	# copyright (serif) (u00A9)
+-1	F0D4	---	# trade mark (serif)
+-1	F0D5	product	# product of (u220F)
+-1	F0D6	sr sqrt	# square root (u221A)
+-1	F0D7	u22C5	# dot operator (u22C5)
+-1	F0D8	no	# not (u00AC)
+-1	F0D9	AN	# logical and (u2227)
+-1	F0DA	OR	# logical or (u2228)
+-1	F0DB	hA	# double arrow left and right (u21D4)
+-1	F0DC	lA lh	# double arrow left (implied by) (u21D0)
+-1	F0DD	arrowverttp uA	# double arrow up (u21D1)
+-1	F0DE	rA rh	# double arrow right (implies) (u21D2)
+-1	F0DF	arrowvertbt dA	# double arrow down (u21D3)
+-1	F0E0	lz	# lozenge (u25CA)
+-1	F0E1	la	# left angle bracket (u2329)
+-1	F0E2	---	# registered (sans serif) (u00AE)
+-1	F0E3	---	# copyright (sans serif) (u00A9)
+-1	F0E4	---	# trade mark (sans serif)
+-1	F0E5	sum	# sum of (u2211)
+-1	F0E6	parenlefttp	# composite left parenthesis (top) (u239B)
+-1	F0E7	parenleftex 	# composite left parenthesis (extender) (u239C)
+-1	F0E8	parenleftbt	# composite left parenthesis (bottom) (u239D)
+-1	F0E9	lc bracketlefttp	# composite left bracket (top) (u23A1)
+-1	F0EA	bracketleftex	# composite left bracket (extender) (u23A2)
+-1	F0EB	lf bracketleftbt	# composite left bracket (bottom) (u23A3)
+-1	F0EC	lt bracelefttp	# composite left brace (top) (u23A7)
+-1	F0ED	lk braceleftex	# composite left brace (middle) (u23A8)
+-1	F0EE	lb braceleftbt	# composite left brace (bottom) (u23A9)
+-1	F0EF	u23AA	# composite brace extender (u23AA)
+-1	F0F0	Eu	# euro sign (u20AC)
+-1	F0F1	ra	# right angle bracket (u232A)
+-1	F0F2	integral is	# integral (u222B)
+-1	F0F3	u2320	# composite integral (top) (u2320)
+-1	F0F4	u23AE	# composite integral extender (u23AE)
+-1	F0F5	u2321	# composite integral (bottom) (u2321)
+-1	F0F6	parenrighttp	# composite right parenthesis (top) (u239E)
+-1	F0F7	parenrightex	# composite right parenthesis (extender) (u239F)
+-1	F0F8	parenrightbt	# composite right parenthesis (bottom) (u23A0)
+-1	F0F9	rc bracketrighttp	# composite right bracket (top) (u23A4)
+-1	F0FA	bracketrightex	# composite right bracket (extender) (u23A5)
+-1	F0FB	rf bracketrightbt	# composite right bracket (bottom) (u23A6)
+-1	F0FC	rt bracerighttp	# composite right brace (top) (u23AB)
+-1	F0FD	rk bracerightex	# composite right brace (middle) (u23AC)
+-1	F0FE	rb bracerightbt	# composite right brace (bottom) (u23AD)
 
 # EOF
diff --git a/font/devlj4/generate/wingdings.map b/font/devlj4/generate/wingdings.map
index 4e1aee58..d868ac2f 100644
--- a/font/devlj4/generate/wingdings.map
+++ b/font/devlj4/generate/wingdings.map
@@ -2,132 +2,232 @@
 #
 # This font is TrueType only, so the MSL values are dummies.
 #
-# Created 12 January 2004 from data on Alan Wood's website
+# Created 16 January 2004 from data on Alan Wood's website
 # (www.alanwood.net).
 #
 # You need hpftodit from groff 1.19.1 or newer!
 
-0	f020	u0020	# Space
-0	f021	u270F	# Pencil
-0	f022	u2702	# Black scissors
-0	f023	u2701	# Upper blade scissors
-0	f028	u260E	# Black telephone
-0	f029	u2706	# Telephone location sign
-0	f02A	u2709	# Envelope
-0	f036	u231B	# Hourglass
-0	f037	u2328	# Keyboard
-0	f03E	u2707	# Tape drive
-0	f03F	u270D	# Writing hand
-0	f041	u270C	# Victory hand
-0	f045	u261C	# White left pointing index
-0	f046	u261E	# White right pointing index
-0	f047	u261D	# White up pointing index
-0	f048	u261F	# White down pointing index
-0	f04A	u263A	# White smiling face
-0	f04C	u2639	# White frowning face
-0	f04E	u2620	# Skull and crossbones
-0	f051	u2708	# Airplane
-0	f052	u263C	# White sun with rays
-0	f054	u2744	# Snowflake
-0	f056	u271E	# Shadowed white Latin cross
-0	f058	u2720	# Maltese cross
-0	f059	u2721	# Star of David
-0	f05A	u262A	# Star and crescent
-0	f05B	u262F	# Yin Yang
-0	f05C	u0950	# Devanagari Om
-0	f05D	u2638	# Wheel of Dharma
-0	f05E	u2648	# Aries
-0	f05F	u2649	# Taurus
-0	f060	u264A	# Gemini
-0	f061	u264B	# Cancer
-0	f062	u264C	# Leo
-0	f063	u264D	# Virgo
-0	f064	u264E	# Libra
-0	f065	u264F	# Scorpio
-0	f066	u2650	# Sagittarius
-0	f067	u2651	# Capricorn
-0	f068	u2652	# Aquarius
-0	f069	u2653	# Pisces
-0	f06A	u0026	# Ampersand
-0	f06B	u0026	# Ampersand
-0	f06C	u25CF	# Black circle
-0	f06D	u274D	# Shadowed white circle
-0	f06E	u25A0	# Black square
-0	f06F	u25A1	# White square
-0	f071	u2751	# Lower right shadowed white square
-0	f072	u2752	# Upper right shadowed white square
-0	f074	u2666	# Black diamond suit
-0	f075	u25C6	# Black diamond
-0	f076	u2756	# Black diamond minus white X
-0	f078	u2327	# X in a rectangle box
-0	f079	u2353	# APL functional symbol quad up caret
-0	f07A	u2318	# Place of interest sign
-0	f07B	u2740	# White florette
-0	f07C	u273F	# Black florette
-0	f07D	u275D	# Heavy double turned comma quotation mark ornament
-0	f07E	u275E	# Heavy double comma quotation mark ornament
-0	f07F	u25AF	# White vertical rectangle
-0	f080	u24EA	# Circled digit zero
-0	f081	u2460	# Circled digit one
-0	f082	u2461	# Circled digit two
-0	f083	u2462	# Circled digit three
-0	f084	u2463	# Circled digit four
-0	f085	u2464	# Circled digit five
-0	f086	u2465	# Circled digit six
-0	f087	u2466	# Circled digit seven
-0	f088	u2467	# Circled digit eight
-0	f089	u2468	# Circled digit nine
-0	f08A	u2469	# Circled number ten
-0	f08B	u24FF	# Negative circled digit zero
-0	f08C	u2776	# Dingbat negative circled digit one
-0	f08D	u2777	# Dingbat negative circled digit two
-0	f08E	u2778	# Dingbat negative circled digit three
-0	f08F	u2779	# Dingbat negative circled digit four
-0	f090	u277A	# Dingbat negative circled digit five
-0	f091	u277B	# Dingbat negative circled digit six
-0	f092	u277C	# Dingbat negative circled digit seven
-0	f093	u277D	# Dingbat negative circled digit eight
-0	f094	u277E	# Dingbat negative circled digit nine
-0	f095	u277F	# Dingbat negative circled number ten
-0	f09E	u00B7	# Middle dot
-0	f09F	u2022	# Bullet
-0	f0A0	u25AA	# Black small square
-0	f0A1	u25CB	# White circle
-0	f0A4	u25C9	# Fisheye
-0	f0A5	u25CE	# Bullseye
-0	f0A7	u25AA	# Black small square
-0	f0A8	u25FB	# White medium square
-0	f0AA	u2726	# Black four pointed star
-0	f0AB	u2605	# Black star
-0	f0AC	u2736	# Six pointed black star
-0	f0AD	u2734	# Eight pointed black star
-0	f0AE	u2739	# Twelve pointed black star
-0	f0AF	u2735	# Eight pointed pinwheel star
-0	f0B1	u2316	# Position indicator
-0	f0B2	u2727	# White four pointed star
-0	f0B3	u2311	# Square lozenge
-0	f0B5	u272A	# Circled white star
-0	f0B6	u2730	# Shadowed white star
-0	f0D5	u232B	# Erase to the left
-0	f0D6	u2326	# Erase to the right
-0	f0D8	u27A2	# Three-D top-lighted rightwards arrowhead
-0	f0DC	u27B2	# Circled heavy white rightwards arrow
-0	f0E8	u2794	# Heavy wide-headed rightwards arrow
-0	f0EF	u21E6	# Leftwards white arrow
-0	f0F0	u21E8	# Rightwards white arrow
-0	f0F1	u21E7	# Upwards white arrow
-0	f0F2	u21E9	# Downwards white arrow
-0	f0F3	u2B04	# Left right white arrow
-0	f0F4	u21F3	# Up down white arrow
-0	f0F5	u2B00	# North east white arrow
-0	f0F6	u2B01	# North west white arrow
-0	f0F7	u2B03	# South west white arrow
-0	f0F8	u2B02	# South east white arrow
-0	f0F9	u25AD	# White rectangle
-0	f0FA	u25AB	# White small square
-0	f0FB	u2717	# Ballot X
-0	f0FC	u2713	# Check mark
-0	f0FD	u2612	# Ballot box with X
-0	f0FE	u2611	# Ballot box with check
+-1	F021	u270F	# Pencil
+-1	F022	u2702	# Black scissors
+-1	F023	u2701	# Upper blade scissors
+-1	F024	---
+-1	F025	---
+-1	F026	---
+-1	F027	---
+-1	F028	u260E	# Black telephone
+-1	F029	u2706	# Telephone location sign
+-1	F02A	u2709	# Envelope
+-1	F02B	---
+-1	F02C	---
+-1	F02D	---
+-1	F02E	---
+-1	F02F	---
+-1	F030	---
+-1	F031	---
+-1	F032	---
+-1	F033	---
+-1	F034	---
+-1	F035	---
+-1	F036	u231B	# Hourglass
+-1	F037	u2328	# Keyboard
+-1	F038	---
+-1	F039	---
+-1	F03A	---
+-1	F03B	---
+-1	F03C	---
+-1	F03D	---
+-1	F03E	u2707	# Tape drive
+-1	F03F	u270D	# Writing hand
+-1	F040	---
+-1	F041	u270C	# Victory hand
+-1	F042	---
+-1	F043	---
+-1	F044	---
+-1	F045	u261C	# White left pointing index
+-1	F046	u261E	# White right pointing index
+-1	F047	u261D	# White up pointing index
+-1	F048	u261F	# White down pointing index
+-1	F049	---
+-1	F04A	u263A	# White smiling face
+-1	F04B	---
+-1	F04C	u2639	# White frowning face
+-1	F04D	---
+-1	F04E	u2620	# Skull and crossbones
+-1	F04F	---
+-1	F050	---
+-1	F051	u2708	# Airplane
+-1	F052	u263C	# White sun with rays
+-1	F053	---
+-1	F054	u2744	# Snowflake
+-1	F055	---
+-1	F056	u271E	# Shadowed white Latin cross
+-1	F057	---
+-1	F058	u2720	# Maltese cross
+-1	F059	u2721	# Star of David
+-1	F05A	u262A	# Star and crescent
+-1	F05B	u262F	# Yin Yang
+-1	F05C	u0950	# Devanagari Om
+-1	F05D	u2638	# Wheel of Dharma
+-1	F05E	u2648	# Aries
+-1	F05F	u2649	# Taurus
+-1	F060	u264A	# Gemini
+-1	F061	u264B	# Cancer
+-1	F062	u264C	# Leo
+-1	F063	u264D	# Virgo
+-1	F064	u264E	# Libra
+-1	F065	u264F	# Scorpio
+-1	F066	u2650	# Sagittarius
+-1	F067	u2651	# Capricorn
+-1	F068	u2652	# Aquarius
+-1	F069	u2653	# Pisces
+-1	F06A	u0026	# Ampersand
+-1	F06B	u0026	# Ampersand
+-1	F06C	u25CF	# Black circle
+-1	F06D	u274D	# Shadowed white circle
+-1	F06E	u25A0	# Black square
+-1	F06F	u25A1	# White square
+-1	F070	---
+-1	F071	u2751	# Lower right shadowed white square
+-1	F072	u2752	# Upper right shadowed white square
+-1	F073	---
+-1	F074	u2666	# Black diamond suit
+-1	F075	u25C6	# Black diamond
+-1	F076	u2756	# Black diamond minus white X
+-1	F077	---
+-1	F078	u2327	# X in a rectangle box
+-1	F079	u2353	# APL functional symbol quad up caret
+-1	F07A	u2318	# Place of interest sign
+-1	F07B	u2740	# White florette
+-1	F07C	u273F	# Black florette
+-1	F07D	u275D	# Heavy double turned comma quotation mark ornament
+-1	F07E	u275E	# Heavy double comma quotation mark ornament
+-1	F080	u24EA	# Circled digit zero
+-1	F081	u2460	# Circled digit one
+-1	F082	u2461	# Circled digit two
+-1	F083	u2462	# Circled digit three
+-1	F084	u2463	# Circled digit four
+-1	F085	u2464	# Circled digit five
+-1	F086	u2465	# Circled digit six
+-1	F087	u2466	# Circled digit seven
+-1	F088	u2467	# Circled digit eight
+-1	F089	u2468	# Circled digit nine
+-1	F08A	u2469	# Circled number ten
+-1	F08B	u24FF	# Negative circled digit zero
+-1	F08C	u2776	# Dingbat negative circled digit one
+-1	F08D	u2777	# Dingbat negative circled digit two
+-1	F08E	u2778	# Dingbat negative circled digit three
+-1	F08F	u2779	# Dingbat negative circled digit four
+-1	F090	u277A	# Dingbat negative circled digit five
+-1	F091	u277B	# Dingbat negative circled digit six
+-1	F092	u277C	# Dingbat negative circled digit seven
+-1	F093	u277D	# Dingbat negative circled digit eight
+-1	F094	u277E	# Dingbat negative circled digit nine
+-1	F095	u277F	# Dingbat negative circled number ten
+-1	F096	---
+-1	F097	---
+-1	F098	---
+-1	F099	---
+-1	F09A	---
+-1	F09B	---
+-1	F09C	---
+-1	F09D	---
+-1	F09E	u00B7	# Middle dot
+-1	F09F	u2022	# Bullet
+-1	F0A0	u25AA	# Black small square
+-1	F0A1	u25CB	# White circle
+-1	F0A2	---
+-1	F0A3	---
+-1	F0A4	u25C9	# Fisheye
+-1	F0A5	u25CE	# Bullseye
+-1	F0A6	---
+-1	F0A7	u25AA	# Black small square
+-1	F0A8	u25FB	# White medium square
+-1	F0A9	---
+-1	F0AA	u2726	# Black four pointed star
+-1	F0AB	u2605	# Black star
+-1	F0AC	u2736	# Six pointed black star
+-1	F0AD	u2734	# Eight pointed black star
+-1	F0AE	u2739	# Twelve pointed black star
+-1	F0AF	u2735	# Eight pointed pinwheel star
+-1	F0B0	---
+-1	F0B1	u2316	# Position indicator
+-1	F0B2	u2727	# White four pointed star
+-1	F0B3	u2311	# Square lozenge
+-1	F0B4	---
+-1	F0B5	u272A	# Circled white star
+-1	F0B6	u2730	# Shadowed white star
+-1	F0B7	---
+-1	F0B8	---
+-1	F0B9	---
+-1	F0BA	---
+-1	F0BB	---
+-1	F0BC	---
+-1	F0BD	---
+-1	F0BE	---
+-1	F0BF	---
+-1	F0C0	---
+-1	F0C1	---
+-1	F0C2	---
+-1	F0C3	---
+-1	F0C4	---
+-1	F0C5	---
+-1	F0C6	---
+-1	F0C7	---
+-1	F0C8	---
+-1	F0C9	---
+-1	F0CA	---
+-1	F0CB	---
+-1	F0CC	---
+-1	F0CD	---
+-1	F0CE	---
+-1	F0CF	---
+-1	F0D0	---
+-1	F0D1	---
+-1	F0D2	---
+-1	F0D3	---
+-1	F0D4	---
+-1	F0D5	u232B	# Erase to the left
+-1	F0D6	u2326	# Erase to the right
+-1	F0D7	---
+-1	F0D8	u27A2	# Three-D top-lighted rightwards arrowhead
+-1	F0D9	---
+-1	F0DA	---
+-1	F0DB	---
+-1	F0DC	u27B2	# Circled heavy white rightwards arrow
+-1	F0DD	---
+-1	F0DE	---
+-1	F0DF	---
+-1	F0E0	---
+-1	F0E1	---
+-1	F0E2	---
+-1	F0E3	---
+-1	F0E4	---
+-1	F0E5	---
+-1	F0E6	---
+-1	F0E7	---
+-1	F0E8	u2794	# Heavy wide-headed rightwards arrow
+-1	F0E9	---
+-1	F0EA	---
+-1	F0EB	---
+-1	F0EC	---
+-1	F0ED	---
+-1	F0EE	---
+-1	F0EF	u21E6	# Leftwards white arrow
+-1	F0F0	u21E8	# Rightwards white arrow
+-1	F0F1	u21E7	# Upwards white arrow
+-1	F0F2	u21E9	# Downwards white arrow
+-1	F0F3	u2B04	# Left right white arrow
+-1	F0F4	u21F3	# Up down white arrow
+-1	F0F5	u2B00	# North east white arrow
+-1	F0F6	u2B01	# North west white arrow
+-1	F0F7	u2B03	# South west white arrow
+-1	F0F8	u2B02	# South east white arrow
+-1	F0F9	u25AD	# White rectangle
+-1	F0FA	u25AB	# White small square
+-1	F0FB	u2717	# Ballot X
+-1	F0FC	u2713	# Check mark
+-1	F0FD	u2612	# Ballot box with X
+-1	F0FE	u2611	# Ballot box with check
+-1	F0FF	---
 
 # EOF
diff --git a/src/devices/grolj4/lj4_font.man b/src/devices/grolj4/lj4_font.man
index 680649c7..e82edff7 100644
--- a/src/devices/grolj4/lj4_font.man
+++ b/src/devices/grolj4/lj4_font.man
@@ -48,32 +48,35 @@ The LaserJet~4 printer used Agfa Intellifont technology for 35 of the
 internal scalable fonts; the remaining 10 scalable fonts were TrueType.
 Beginning with the LaserJet~4000\(enseries printers introduced in 1997,
 all scalable internal fonts have been TrueType.
-Printable glyphs differ slightly between Intellifont and TrueType fonts
-(generally, the TrueType fonts include more glyphs), and there are some
-minor differences in glyph metrics.
+The number of printable glyphs differs slightly between Intellifont and
+TrueType fonts (generally, the TrueType fonts include more glyphs), and
+there are some minor differences in glyph metrics.
 Differences among printer models are described in the
 .I "PCL~5 Comparison Guide"
 and the
 .I "PCL~5 Comparison Guide Addendum"
 (for printers introduced since approximately 2001).
 .LP
-LaserJet printers access a glyph by a combination of a 256-glyph symbol
-set and an index within that symbol set.
+LaserJet printers reference a glyph by a combination of a 256-glyph
+symbol set and an index within that symbol set.
+Many glyphs appear in more than one symbol set; all combinations of
+symbol set and index that reference the same glyph are equivalent.
+For each glyph,
+.BR hpftodit (@MAN1EXT@)
+searches a list of symbol sets, and selects the first set that contains
+the glyph.
 The printing code generated by
 .BR hpftodit (@MAN1EXT@)
-is an integer that encodes a numerical value for the symbol
-set in the high byte(s), and the index in the low byte.
-Many glyphs appear in more than one symbol set, and consequently can be
-accessed by more than one printing code; all such printing codes are
-equivalent.
+is an integer that encodes a numerical value for the symbol set in the
+high byte(s), and the index in the low byte.
 See
 .BR groff_font (@MAN5EXT@)
-for a complete description of the font file format;
-symbol sets are described in greater detail in the
+for a complete description of the font file format; symbol sets are
+described in greater detail in the
 .IR "PCL~5 Printer Language Technical Reference Manual" .
 .LP
 Two of the scalable fonts, Symbol and Wingdings, are bound to
-256-character symbol sets; the remaining scalable fonts, as well as the
+256-glyph symbol sets; the remaining scalable fonts, as well as the
 Lineprinter font, support numerous symbol sets, sufficient to enable
 printing of more than 600 glyphs.
 .LP