* tmac/www.tmac (DC): Handle TTY devices.

* doc/webpage.ms: Document viewCVS from ffii.org.
* NEWS, README: Updated.

* src/roff/groff/groff.man: Mention lj4_font man page.

* font/devlj4/generate/Makefile (SYMBOLMAP, WINGDINGSMAP): New
variables.
(FONTS): Add SYMBOL and WINGDINGS.
(SYMBOL, WINGDINGS): New targets.

* src/devices/grolj4/lj4_font.man: New man page.
* src/devices/grolj4/Makefile.sub (MAN5): New variable.
* src/devices/grolj4.man: Mention lj4_font man page.

* src/utils/hpftodit/hpftodit.cpp (read_map): Handle line comments.
* src/utils/hpftodit/hpftodit.man: Document it.
(CW): New macro.
Remove details about fonts (which are now in lj4_font.man).

* font/devlj4/generate/symbol.map,
font/devlj4/generate/wingdings.map: New files.

3 files changed, 345 insertions, 2 deletions

diff --git a/font/devlj4/generate/Makefile b/font/devlj4/generate/Makefile
index 78801aa5..e7454cf9 100644
--- a/font/devlj4/generate/Makefile
+++ b/font/devlj4/generate/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2002, 2003, 2004 Free Software Foundation, Inc.
 #     Written by James Clark (jjc@jclark.com)
 #
 # This file is part of groff.
@@ -41,6 +41,8 @@ SFLAG=-s
 srcdir=generate
 TEXTMAP=$(srcdir)/text.map
 SPECIALMAP=$(srcdir)/special.map
+SYMBOLMAP=$(srcdir)/symbol.map
+WINGDINGSMAP=$(srcdir)/wingdings.map
 
 FONTS=\
   AB ABI AI AR \
@@ -54,7 +56,8 @@ FONTS=\
   TNRB TNRBI TNRI TNRR \
   UB UBI UI UR \
   UCB UCBI UCI UCR \
-  CLARENDON CORONET MARIGOLD S
+  CLARENDON CORONET MARIGOLD S \
+  SYMBOL WINGDINGS
 
 all: $(FONTS)
 
@@ -241,6 +244,14 @@ AB: $(AUTOFONT)/arlb000s.tfm $(TEXTMAP)
 ABI: $(AUTOFONT)/arlj000s.tfm $(TEXTMAP)
 	$(HPFTODIT) $(IFLAG) $(AUTOFONT)/arlj000s.tfm $(TEXTMAP) $@
 
+# Symbol
+SYMBOL: $(AUTOFONT)/9nb00078.tfm $(SYMBOLMAP)
+	$(HPFTODIT) $(AUTOFONT)/9nb00078.tfm $(SYMBOLMAP) $@
+
+# Wingdings
+WINGDINGS: $(AUTOFONT)/9nb00095.tfm $(WINGDINGSMAP)
+	$(HPFTODIT) $(AUTOFONT)/9nb00095.tfm $(WINGDINGSMAP) $@
+
 
 clean:
 
diff --git a/font/devlj4/generate/symbol.map b/font/devlj4/generate/symbol.map
new file mode 100644
index 00000000..b292e856
--- /dev/null
+++ b/font/devlj4/generate/symbol.map
@@ -0,0 +1,199 @@
+# Map HP Unicode values to groff names for Monotype Symbol font.
+#
+# This font is TrueType only, so the MSL values are dummies.
+#
+# Created 12 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)
+
+# EOF
diff --git a/font/devlj4/generate/wingdings.map b/font/devlj4/generate/wingdings.map
new file mode 100644
index 00000000..4e1aee58
--- /dev/null
+++ b/font/devlj4/generate/wingdings.map
@@ -0,0 +1,133 @@
+# Map HP Unicode values to troff names for Wingding font.
+#
+# This font is TrueType only, so the MSL values are dummies.
+#
+# Created 12 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
+
+# EOF