about summary refs log tree commit diff stats
path: root/WWW
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>1998-02-19 10:57:28 -0500
committerThomas E. Dickey <dickey@invisible-island.net>1998-02-19 10:57:28 -0500
commit899516a7c8880df05e30bbbed72ca1d3cb7a4f00 (patch)
tree14b895432dc4e84686c36bdeee4c689706af5361 /WWW
parentc82d2a4041724afe1dce249c78c4f034ca6a8d69 (diff)
downloadlynx-snapshots-899516a7c8880df05e30bbbed72ca1d3cb7a4f00.tar.gz
snapshot of project "lynx", label v2-7-1ac-0_115
Diffstat (limited to 'WWW')
-rw-r--r--WWW/Library/Implementation/BSDI_Makefile405
-rw-r--r--WWW/Library/Implementation/HTAAProt.c4
-rw-r--r--WWW/Library/Implementation/HTFile.c8
-rw-r--r--WWW/Library/Implementation/HTMLDTD.c1084
-rw-r--r--WWW/Library/Implementation/HTMLGen.c4
-rw-r--r--WWW/Library/Implementation/HTPlain.c6
-rw-r--r--WWW/Library/Implementation/SGML.c281
-rw-r--r--WWW/Library/Implementation/SGML.h6
-rw-r--r--WWW/Library/Implementation/entities.h1083
-rw-r--r--WWW/Library/apollo_m68k/Makefile38
-rw-r--r--WWW/Library/clix/Makefile30
-rw-r--r--WWW/Library/convex/Makefile32
-rw-r--r--WWW/Library/decstation/Makefile23
-rw-r--r--WWW/Library/duns/Makefile489
-rw-r--r--WWW/Library/freebsd/Makefile27
-rw-r--r--WWW/Library/isc/Makefile30
-rw-r--r--WWW/Library/mips/Makefile29
-rw-r--r--WWW/Library/netbsd/Makefile29
-rw-r--r--WWW/Library/next/Makefile40
-rw-r--r--WWW/Library/osf/Makefile23
-rw-r--r--WWW/Library/ptx/Makefile29
-rw-r--r--WWW/Library/rs6000/Makefile29
-rw-r--r--WWW/Library/sco/Makefile33
-rw-r--r--WWW/Library/sgi/Makefile30
-rw-r--r--WWW/Library/snake/Makefile33
-rw-r--r--WWW/Library/solaris2/Makefile29
-rw-r--r--WWW/Library/sun3/Makefile29
-rw-r--r--WWW/Library/sun4/Makefile29
-rw-r--r--WWW/Library/svr4/Makefile29
-rw-r--r--WWW/Library/umaxv-m88k/Makefile30
-rw-r--r--WWW/Library/unix_x/Makefile491
-rw-r--r--WWW/Library/vax_ultrix/Makefile33
32 files changed, 1297 insertions, 3198 deletions
diff --git a/WWW/Library/Implementation/BSDI_Makefile b/WWW/Library/Implementation/BSDI_Makefile
deleted file mode 100644
index 21ff1c02..00000000
--- a/WWW/Library/Implementation/BSDI_Makefile
+++ /dev/null
@@ -1,405 +0,0 @@
-#  Make WWW under unix
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = unix
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = generic/unix
-
-
-CFLAGS =  -O -DDEBUG -DUSE_DIRENT -DSVR4 -DNO_FILIO_H
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#	Common Makefile for W3 Library Code
-#	-----------------------------------
-#
-#	(c) CERN 1990, 1991 -- see Copyright.html for conditions
-#
-# This file should be invariant between systems.
-#	DEPENDENCIES NOT COMPLETE @@
-#
-#	make		Compile and link the software (private version)
-#	make install	Copy it into the system (implies make)
-#	make update	Copy installed version into installed version
-#	make uninstall	Unlink installed version from the system
-#	make clean	Remove intermediate files
-#	make cleanall	Remove intremediate files and products
-#	
-# Macros required to be defined already for make:
-#
-# CC		The C compiler
-# CFLAGS	Flags for $(CC) -- except the -I which are below
-# LFLAGS	Flags for ld
-# LYFLAGS	Flags for Lynx
-#
-# WWW           The WWW source tree directory
-#
-# Macros needed for make install:
-#
-# LIBDIR	Directory for installed library
-#______________________________________________________________________
-
-#  If this env var is set to something else Some makes will use that instead
-SHELL = /bin/sh
-
-#	.h files are distributed but originally are made from the
-#	self-documenting hypertext files.
-
-.SUFFIXES: .h .html
-.html.h:
-#	- chmod +w $*.h
-	www -w90 -na -to text/x-c $*.html > $*.h
-#	chmod -w $*.h
-
-# If this is actually run in a subdirectory,
-#
-# WWW = ../../..
-# WWW = ../..	For [cernlib] build in this directory
-
-WC = $(WWW)/Library
-CMN = $(WWW)/Library/Implementation/
-VMS = $(CMN)vms
-# Where shall we put the objects and built library?
-
-LOB = $(WTMP)/Library/$(WWW_MACH)
-
-# Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include
-#  uncomment these and fill in WAISINC for adding direct wais access
-#  to Lynx.
-#HTWAIS = $(LOB)/HTWAIS.o
-#WAIS = YES
-#WAISINC = -I../../../../freeWAIS-0.202/ir
-#WAISCFLAGS = -DDIRECT_WAIS 
-#
-
-# This path, if relative, is taken relative to the directory
-# in which this makefile is, not the pwd.  This screws up the 
-# recursive invocation
-# include $(CMN)Version.make
-VC = 2.14
-
-# XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
-#
-# add -DNEW_GATEWAY here for the new gateway config stuff
-CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH 
-
-CERNLIBBIN = $(WWW)/bin
-
-COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \
-	$(LOB)/HTFile.o	$(LOB)/HTBTree.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \
-	$(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \
-	$(LOB)/HTPlain.o $(LOB)/HTWriter.o \
-	$(LOB)/HTMLGen.o \
-	$(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \
-	$(LOB)/HTList.o $(LOB)/HTString.o \
-	$(LOB)/HTRules.o $(LOB)/HTFormat.o  $(LOB)/HTMIME.o \
-	$(LOB)/HTHistory.o $(LOB)/HTNews.o  $(LOB)/HTGopher.o \
-	$(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS) \
-	$(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \
-	$(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o  \
-	$(LOB)/HTACL.o    $(LOB)/HTAuth.o   $(LOB)/HTAAProt.o \
-	$(LOB)/HTAssoc.o  $(LOB)/HTLex.o    $(LOB)/HTUU.o
-
-CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \
-        $(CMN)HTBTree.c \
-	$(CMN)HTFTP.c   $(CMN)HTTCP.c     $(CMN)SGML.c 	\
-	$(CMN)HTMLDTD.c \
-	$(CMN)HTPlain.c	$(CMN)HTWriter.c  \
-        $(CMN)HTMLGen.c	\
-	$(CMN)HTChunk.c $(CMN)HTAtom.c   $(CMN)HTAnchor.c $(CMN)HTStyle.c \
-	$(CMN)HTList.c  $(CMN)HTString.c $(CMN)HTRules.c \
-	$(CMN)HTFormat.c $(CMN)HTMIME.c $(CMN)HTHistory.c \
-	$(CMN)HTNews.c  $(CMN)HTGopher.c $(CMN)HTTelnet.c \
-	$(CMN)HTFinger.c $(CMN)HTWAIS.c  $(CMN)HTWSRC.c \
-	$(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \
-	$(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c  \
-	$(CMN)HTACL.c    $(CMN)HTAuth.c   $(CMN)HTAAProt.c \
-	$(CMN)HTAssoc.c  $(CMN)HTLex.c    $(CMN)HTUU.c
-
-HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \
-	$(CMN)HTBTree.h $(CMN)HTFTP.h $(CMN)HTTCP.h \
-	$(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \
-	$(CMN)HTPlain.h		$(CMN)HTWriter.h \
-	$(CMN)HTFWriter.h 	$(CMN)HTMLGen.h	\
-	$(CMN)HTStream.h \
-	$(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \
-	$(CMN)HTList.h \
-	$(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \
-	$(CMN)HTFormat.h $(CMN)HTInit.h \
-	$(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \
-	$(CMN)HTGopher.h \
-	$(CMN)HTUtils.h $(CMN)tcp.h $(CMN)HText.h \
-	$(CMN)HTTelnet.h $(CMN)HTFinger.h \
-	$(CMN)HTWAIS.h  $(CMN)HTWSRC.h \
-	$(CMN)HTAAUtil.h $(CMN)HTAAServ.h $(CMN)HTAABrow.h \
-	$(CMN)HTAAFile.h $(CMN)HTPasswd.h $(CMN)HTGroup.h  \
-	$(CMN)HTACL.h    $(CMN)HTAuth.h   $(CMN)HTAAProt.h \
-	$(CMN)HTAssoc.h  $(CMN)HTLex.h    $(CMN)HTUU.h
-
-SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make \
-	$(CMN)CommonMakefile $(CMN)Makefile \
-	$(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD $(WWW)/Makefile
-SPECIFIC = $(WWW)/All/*/Makefile.include $(WWW)/All/Implementation/Makefile* \
-	$(VMS)/descrip.mms $(VMS)/build_multinet.com \
-	$(VMS)/COPYING.LIB $(VMS)/setup.com $(VMS)/multinet.opt \
-	$(VMS)/patchlevel.h $(VMS)/ufc-crypt.h \
-	$(VMS)/crypt.c $(VMS)/crypt_util.c \
-	$(VMS)/getline.c $(VMS)/getpass.c \
-	$(VMS)/HTVMSUtils.h $(VMS)/HTVMSUtils.c
-
-
-#	Library
-#
-#  On SGI, ranlib is unnecessary and does not exist so we ignore errors
-# for that step
-$(LOB)/libwww.a : $(COMMON)
-	ar r $(LOB)/libwww.a $(COMMON)
-	-ranlib $(LOB)/libwww.a
-
-#	Clean up everything generatable except final products
-clean :
-	rm $(LOB)/*.o $(LOB)/.created
-	-rmdir $(LOB)
-
-#	Clean up everything generatable including final products
-
-cleanall : clean
-	rm $(LOB)/libwww.a
-
-#	Install W3 library into system space (not normally necessary)
-
-install : libwww.a
-	if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR)
-	cp libwww.a $(LIBDIR)/libwww.a
-	
-uninstall :
-	rm $(LIBDIR)/libwww.a
-
-#		Distribution use only:
-#		----------------------
-
-#	Needs www version 2.4 or later to do this
-inc : $(HFILES)
-	echo Include files generated from hypertext.
-
-binary : /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
-	echo FTP archive binary Libray $(VC) for $(WWW_MACH) up to date.
-
-
-/pub/www/bin/$(WWW_MACH)/libwww_$(VC).a : libwww.a
-	-mkdir /pub/www/bin/$(WWW_MACH)
-	cp libwww.a /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
-
-#	Source Distribution:
-
-distribute :  /pub/www/README.txt /pub/www/Copyright.txt
-	(cd $(WWW)/..; WWW=WWW ABS=`pwd`/ make $(MFLAGS) \
-		-f WWW/Library/Implementation/CommonMakefile \
-		/pub/www/src/WWWLibrary_$(VC).tar.Z)
-	(cd ../Implementation; cvs tag \
-	    `sed -e 's/VC = /v/' Version.make | sed -e 's?\.?/?'` )
-	echo Distribution of Library version $(VC) up to date.
-
-/pub/www/src/WWWLibrary_$(VC).tar.Z : $(SOURCES)
-	tar cf /pub/www/src/WWWLibrary_$(VC).tar \
-	    $(SOURCES)  $(SPECIFIC) $(WC)/*/Makefile
-	compress /pub/www/src/WWWLibrary_$(VC).tar
-
-
-#	Hypertext supplied in text format
-#	---------------------------------
-
-$(WWW)/README.txt : $(WWW)/../README.html
-	www -n -p66 http://www.w3.org/hypertext/README.html \
-		> $(WWW)/README.txt
-/pub/www/README.txt : $(WWW)/README.txt
-	cp $(WWW)/README.txt /pub/www/README.txt
-
-$(WWW)/Copyright.txt : $(WWW)/../Copyright.html
-	www -n -p66 http://www.w3.org/hypertext/Copyright.html \
-		> $(WWW)/Copyright.txt
-/pub/www/Copyright.txt : $(WWW)/Copyright.txt
-	cp $(WWW)/Copyright.txt /pub/www/Copyright.txt
-
-# 			Common code
-#			-----------
-
-#	Directory for object files - .created checks it exists
-
-OE = $(LOB)/.created
-$(OE) :
-	if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi
-	if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK ; fi
-	if [ ! -r $(WTMP)/Library/$(WWW_MACH) ] ; \
-		then mkdir $(WTMP)/Library/$(WWW_MACH); else echo OK ; fi
-	touch $@
-
-$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
-
-$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c
-
-$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c
-
-$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c
-
-$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c
-
-$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\
-	 $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c
-
-$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \
-	 $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c
-
-$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c
-
-$(LOB)/HTFinger.o : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \
-	$(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFinger.c
-
-$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c
-
-$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c
-
-$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c
-
-$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c
-
-$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \
-	 $(CMN)HTAAServ.h $(CMN)HTAAProt.h
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c
-
-$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h $(CMN)UCAux.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c
-
-$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c
-
-$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c
-
-$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h \
-	 $(CMN)UCAux.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c
-
-$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c
-
-$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c
-
-$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c
-
-
-#	Access Authorization
-
-$(LOB)/HTAAUtil.o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \
-	 $(CMN)HTUtils.h $(CMN)HTString.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAUtil.c
-
-$(LOB)/HTAAFile.o : $(OE) $(CMN)HTAAFile.c $(CMN)HTAAFile.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAFile.c
-
-$(LOB)/HTPasswd.o : $(OE) $(CMN)HTPasswd.c $(CMN)HTPasswd.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPasswd.c
-
-$(LOB)/HTGroup.o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
-	 $(CMN)HTAssoc.h $(CMN)HTLex.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGroup.c
-
-$(LOB)/HTACL.o : $(OE) $(CMN)HTACL.c $(CMN)HTACL.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTGroup.h \
-	 $(CMN)HTAssoc.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTACL.c
-
-$(LOB)/HTAuth.o : $(OE) $(CMN)HTAuth.c $(CMN)HTAuth.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTPasswd.h $(CMN)HTAAFile.h \
-	 $(CMN)HTAssoc.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAuth.c
-
-$(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \
-	$(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTPasswd.h \
-	 $(CMN)HTGroup.h $(CMN)HTACL.h $(CMN)HTAuth.h \
-	 $(CMN)HTUU.h $(CMN)HTParse.h $(CMN)HTList.h \
-	 $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTRules.h \
-	 $(CMN)HTAAProt.h $(CMN)HTAssoc.h $(CMN)HTLex.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAServ.c
-
-$(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTUU.h \
-	 $(CMN)HTUtils.h $(CMN)HTString.h \
-	 $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \
-	 $(CMN)HTAssoc.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c
-
-$(LOB)/HTAAProt.o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \
-	 $(CMN)HTUtils.h $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
-	 $(CMN)HTAssoc.h $(CMN)HTLex.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAProt.c
-
-$(LOB)/HTAssoc.o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \
-	$(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAssoc.c
-
-$(LOB)/HTLex.o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTLex.c
-
-$(LOB)/HTUU.o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTUU.c
-
-
-#	Communications & Files
-
-$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c
-
-$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c
-
-$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \
-	 $(CMN)HTMLDTD.h $(CMN)HTAAServ.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c
-
-$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c
-
-$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c
-
-$(LOB)/HTAccess.o : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c
-
-$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c
-
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index 91fc81bd..9b40c3be 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -176,21 +176,25 @@ PUBLIC int HTAA_getGid NOARGS
     if (current_prot  &&  current_prot->gid_name) {
 	if (isNumber(current_prot->gid_name)) {
 	    if (NULL != (gr = getgrgid(atoi(current_prot->gid_name)))) {
+#ifndef __EMX__	/* no gr_passwd */
 		if (TRACE) fprintf(stderr,
 				   "%s(%s) returned (%s:%s:%d:...)\n",
 				   "HTAA_getGid: getgrgid",
 				   current_prot->gid_name,
 				   gr->gr_name, gr->gr_passwd, gr->gr_gid);
+#endif
 		return gr->gr_gid;
 	    }
 	}
 	else {	/* Group name (not number) */
 	    if (NULL != (gr = getgrnam(current_prot->gid_name))) {
+#ifndef __EMX__	/* no gr_passwd */
 		if (TRACE) fprintf(stderr, 
 				   "%s(\"%s\") returned (%s:%s:%d:...)\n",
 				   "HTAA_getGid: getgrnam",
 				   current_prot->gid_name,
 				   gr->gr_name, gr->gr_passwd, gr->gr_gid);
+#endif
 		return gr->gr_gid;
 	    }
 	}
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 5459cbf6..94815710 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -235,12 +235,14 @@ PRIVATE void LYListFmtParse ARGS5(
 			sprintf(buf, fmt, entry);
 			PUTS(buf);
 			END(HTML_A);
+#ifdef S_IFLNK
 			if (c != 'A' && (st.st_mode & S_IFMT) == S_IFLNK &&
 			    (len = readlink(file, buf, sizeof(buf))) >= 0) {
 				PUTS(" -> ");
 				buf[len] = '\0';
 				PUTS(buf);
 			}
+#endif
 			*buf = '\0';
 			break;
 
@@ -284,9 +286,13 @@ PRIVATE void LYListFmtParse ARGS5(
 			case S_IFIFO: type = 'p'; break;
 			case S_IFCHR: type = 'c'; break;
 			case S_IFDIR: type = 'd'; break;
-			case S_IFBLK: type = 'b'; break;
 			case S_IFREG: type = '-'; break;
+#ifdef S_IFBLK
+			case S_IFBLK: type = 'b'; break;
+#endif
+#ifdef S_IFLNK
 			case S_IFLNK: type = 'l'; break;
+#endif
 #ifdef S_IFSOCK
 # ifdef S_IFIFO 	/* some older machines (e.g., apollo) have a conflict */
 #  if S_IFIFO != S_IFSOCK
diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c
index e0dbe2e8..441f081f 100644
--- a/WWW/Library/Implementation/HTMLDTD.c
+++ b/WWW/Library/Implementation/HTMLDTD.c
@@ -131,1089 +131,7 @@ static CONST char* entities[] = {
 
 #define HTML_ENTITIES 112
 
-/*	Extra Entity Names
-**	------------------
-**
-**	This table contains Unicodes in addition to the Names.
-**
-*
-*	Whole entities[] thing above (and much more) now present
-*	in this kind of structure. The structured streams to which
-*	the SGML modules sends its output could then easily have access
-*	to both entity names and unicode values for each (special)
-*	character.  Probably the whole translation to display characters
-*	should be done at that later stage (e.g. in HTML.c).
-*	What's missing is a way for the later stage to return info
-*	to SGML whether the entity could be displayed or not.
-*	(like between SGML_character() and handle_entity() via FoundEntity.)
-*	Well, trying to do that now.
-*	Why keep two structures for entities?  Backward compatibility..
-*/
-
-/* UC_entity_info structure is defined in SGML.h. */
-/* This has to be sorted alphabetically (case-sensitive),
-   bear this in mind when you add some more entities..
-
-This table available from ftp://ftp.unicode.org/MAPPINGS/
-original comment follows:
-
-
-# Author: John Cowan <cowan@ccil.org>
-# Date: 25 July 1997
-#
-# The following table maps SGML character entities from various
-# public sets (namely, ISOamsa, ISOamsb, ISOamsc, ISOamsn, ISOamso,
-# ISOamsr, ISObox, ISOcyr1, ISOcyr2, ISOdia, ISOgrk1, ISOgrk2,
-# ISOgrk3, ISOgrk4, ISOlat1, ISOlat2, ISOnum, ISOpub, ISOtech,
-# HTMLspecial, HTMLsymbol) to corresponding Unicode characters.
-#
-# The table has four tab-separated columns:
-#	Column 1: SGML character entity name
-#	Column 2: SGML public entity set
-#	Column 3: Unicode 2.0 character code
-#	Column 4: Unicode 2.0 character name (UPPER CASE)
-# Entries which don't have Unicode equivalents have "0x????"
-# in Column 3 and a lower case description (from the public entity
-# set DTD) in Column 4.  The mapping is not reversible, because many
-# distinctions are unified away in Unicode, particularly between
-# mathematical symbols.
-#
-# The table is sorted case-blind by SGML character entity name.
-#
-# The contents of this table are drawn from various sources, and
-# are in the public domain.
-#
-*/
-
-/* We just sort it and move column 2 away (line too long, sorry).
-   Also we add a few synonyms (obsolete):
-   "brkbar"  for "brvbar" 0x00A6
-   "emdash"  for "mdash" 0x2014
-   "endash"  for "ndash" 0x2013
-   "hibar"  for "macr" 0x00AF
-   for exact compatibility with entities[] and previous bevavior.
-   BTW, lots of synonyms found in this table, we shouldn't worry about...
-*/
-
-static CONST UC_entity_info extra_entities[] = {
-  {"AElig",	0x00C6},  /* LATIN CAPITAL LETTER AE			   */
-  {"Aacgr",	0x0386},  /* GREEK CAPITAL LETTER ALPHA WITH TONOS	   */
-  {"Aacute",	0x00C1},  /* LATIN CAPITAL LETTER A WITH ACUTE		   */
-  {"Abreve",	0x0102},  /* LATIN CAPITAL LETTER A WITH BREVE		   */
-  {"Acirc",	0x00C2},  /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX	   */
-  {"Acy",	0x0410},  /* CYRILLIC CAPITAL LETTER A			   */
-  {"Agr",	0x0391},  /* GREEK CAPITAL LETTER ALPHA 		   */
-  {"Agrave",	0x00C0},  /* LATIN CAPITAL LETTER A WITH GRAVE		   */
-  {"Alpha",	0x0391},  /* GREEK CAPITAL LETTER ALPHA 		   */
-  {"Amacr",	0x0100},  /* LATIN CAPITAL LETTER A WITH MACRON 	   */
-  {"Aogon",	0x0104},  /* LATIN CAPITAL LETTER A WITH OGONEK 	   */
-  {"Aring",	0x00C5},  /* LATIN CAPITAL LETTER A WITH RING ABOVE	   */
-  {"Atilde",	0x00C3},  /* LATIN CAPITAL LETTER A WITH TILDE		   */
-  {"Auml",	0x00C4},  /* LATIN CAPITAL LETTER A WITH DIAERESIS	   */
-  {"Barwed",	0x2306},  /* PERSPECTIVE				   */
-  {"Bcy",	0x0411},  /* CYRILLIC CAPITAL LETTER BE 		   */
-  {"Beta",	0x0392},  /* GREEK CAPITAL LETTER BETA			   */
-  {"Bgr",	0x0392},  /* GREEK CAPITAL LETTER BETA			   */
-  {"CHcy",	0x0427},  /* CYRILLIC CAPITAL LETTER CHE		   */
-  {"Cacute",	0x0106},  /* LATIN CAPITAL LETTER C WITH ACUTE		   */
-  {"Cap",	0x22D2},  /* DOUBLE INTERSECTION			   */
-  {"Ccaron",	0x010C},  /* LATIN CAPITAL LETTER C WITH CARON		   */
-  {"Ccedil",	0x00C7},  /* LATIN CAPITAL LETTER C WITH CEDILLA	   */
-  {"Ccirc",	0x0108},  /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX	   */
-  {"Cdot",	0x010A},  /* LATIN CAPITAL LETTER C WITH DOT ABOVE	   */
-  {"Chi",	0x03A7},  /* GREEK CAPITAL LETTER CHI			   */
-  {"Cup",	0x22D3},  /* DOUBLE UNION				   */
-  {"DJcy",	0x0402},  /* CYRILLIC CAPITAL LETTER DJE		   */
-  {"DScy",	0x0405},  /* CYRILLIC CAPITAL LETTER DZE		   */
-  {"DZcy",	0x040F},  /* CYRILLIC CAPITAL LETTER DZHE		   */
-  {"Dagger",	0x2021},  /* DOUBLE DAGGER				   */
-  {"Dcaron",	0x010E},  /* LATIN CAPITAL LETTER D WITH CARON		   */
-  {"Dcy",	0x0414},  /* CYRILLIC CAPITAL LETTER DE 		   */
-  {"Delta",	0x0394},  /* GREEK CAPITAL LETTER DELTA 		   */
-  {"Dgr",	0x0394},  /* GREEK CAPITAL LETTER DELTA 		   */
-  {"Dot",	0x00A8},  /* DIAERESIS					   */
-  {"DotDot",	0x20DC},  /* COMBINING FOUR DOTS ABOVE			   */
-  {"Dstrok",	0x0110},  /* LATIN CAPITAL LETTER D WITH STROKE 	   */
-  {"EEacgr",	0x0389},  /* GREEK CAPITAL LETTER ETA WITH TONOS	   */
-  {"EEgr",	0x0397},  /* GREEK CAPITAL LETTER ETA			   */
-  {"ENG",	0x014A},  /* LATIN CAPITAL LETTER ENG			   */
-  {"ETH",	0x00D0},  /* LATIN CAPITAL LETTER ETH			   */
-  {"Eacgr",	0x0388},  /* GREEK CAPITAL LETTER EPSILON WITH TONOS	   */
-  {"Eacute",	0x00C9},  /* LATIN CAPITAL LETTER E WITH ACUTE		   */
-  {"Ecaron",	0x011A},  /* LATIN CAPITAL LETTER E WITH CARON		   */
-  {"Ecirc",	0x00CA},  /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX	   */
-  {"Ecy",	0x042D},  /* CYRILLIC CAPITAL LETTER E			   */
-  {"Edot",	0x0116},  /* LATIN CAPITAL LETTER E WITH DOT ABOVE	   */
-  {"Egr",	0x0395},  /* GREEK CAPITAL LETTER EPSILON		   */
-  {"Egrave",	0x00C8},  /* LATIN CAPITAL LETTER E WITH GRAVE		   */
-  {"Emacr",	0x0112},  /* LATIN CAPITAL LETTER E WITH MACRON 	   */
-  {"Eogon",	0x0118},  /* LATIN CAPITAL LETTER E WITH OGONEK 	   */
-  {"Epsilon",	0x0395},  /* GREEK CAPITAL LETTER EPSILON		   */
-  {"Eta",	0x0397},  /* GREEK CAPITAL LETTER ETA			   */
-  {"Euml",	0x00CB},  /* LATIN CAPITAL LETTER E WITH DIAERESIS	   */
-  {"Fcy",	0x0424},  /* CYRILLIC CAPITAL LETTER EF 		   */
-  {"GJcy",	0x0403},  /* CYRILLIC CAPITAL LETTER GJE		   */
-  {"Gamma",	0x0393},  /* GREEK CAPITAL LETTER GAMMA 		   */
-  {"Gbreve",	0x011E},  /* LATIN CAPITAL LETTER G WITH BREVE		   */
-  {"Gcedil",	0x0122},  /* LATIN CAPITAL LETTER G WITH CEDILLA	   */
-  {"Gcirc",	0x011C},  /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX	   */
-  {"Gcy",	0x0413},  /* CYRILLIC CAPITAL LETTER GHE		   */
-  {"Gdot",	0x0120},  /* LATIN CAPITAL LETTER G WITH DOT ABOVE	   */
-  {"Gg",	0x22D9},  /* VERY MUCH GREATER-THAN			   */
-  {"Ggr",	0x0393},  /* GREEK CAPITAL LETTER GAMMA 		   */
-  {"Gt",	0x226B},  /* MUCH GREATER-THAN				   */
-  {"HARDcy",	0x042A},  /* CYRILLIC CAPITAL LETTER HARD SIGN		   */
-  {"Hcirc",	0x0124},  /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX	   */
-  {"Hstrok",	0x0126},  /* LATIN CAPITAL LETTER H WITH STROKE 	   */
-  {"IEcy",	0x0415},  /* CYRILLIC CAPITAL LETTER IE 		   */
-  {"IJlig",	0x0132},  /* LATIN CAPITAL LIGATURE IJ			   */
-  {"IOcy",	0x0401},  /* CYRILLIC CAPITAL LETTER IO 		   */
-  {"Iacgr",	0x038A},  /* GREEK CAPITAL LETTER IOTA WITH TONOS	   */
-  {"Iacute",	0x00CD},  /* LATIN CAPITAL LETTER I WITH ACUTE		   */
-  {"Icirc",	0x00CE},  /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX	   */
-  {"Icy",	0x0418},  /* CYRILLIC CAPITAL LETTER I			   */
-  {"Idigr",	0x03AA},  /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA	   */
-  {"Idot",	0x0130},  /* LATIN CAPITAL LETTER I WITH DOT ABOVE	   */
-  {"Igr",	0x0399},  /* GREEK CAPITAL LETTER IOTA			   */
-  {"Igrave",	0x00CC},  /* LATIN CAPITAL LETTER I WITH GRAVE		   */
-  {"Imacr",	0x012A},  /* LATIN CAPITAL LETTER I WITH MACRON 	   */
-  {"Iogon",	0x012E},  /* LATIN CAPITAL LETTER I WITH OGONEK 	   */
-  {"Iota",	0x0399},  /* GREEK CAPITAL LETTER IOTA			   */
-  {"Itilde",	0x0128},  /* LATIN CAPITAL LETTER I WITH TILDE		   */
-  {"Iukcy",	0x0406},  /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN*/
-  {"Iuml",	0x00CF},  /* LATIN CAPITAL LETTER I WITH DIAERESIS	   */
-  {"Jcirc",	0x0134},  /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX	   */
-  {"Jcy",	0x0419},  /* CYRILLIC CAPITAL LETTER SHORT I		   */
-  {"Jsercy",	0x0408},  /* CYRILLIC CAPITAL LETTER JE 		   */
-  {"Jukcy",	0x0404},  /* CYRILLIC CAPITAL LETTER UKRAINIAN IE	   */
-  {"KHcy",	0x0425},  /* CYRILLIC CAPITAL LETTER HA 		   */
-  {"KHgr",	0x03A7},  /* GREEK CAPITAL LETTER CHI			   */
-  {"KJcy",	0x040C},  /* CYRILLIC CAPITAL LETTER KJE		   */
-  {"Kappa",	0x039A},  /* GREEK CAPITAL LETTER KAPPA 		   */
-  {"Kcedil",	0x0136},  /* LATIN CAPITAL LETTER K WITH CEDILLA	   */
-  {"Kcy",	0x041A},  /* CYRILLIC CAPITAL LETTER KA 		   */
-  {"Kgr",	0x039A},  /* GREEK CAPITAL LETTER KAPPA 		   */
-  {"LJcy",	0x0409},  /* CYRILLIC CAPITAL LETTER LJE		   */
-  {"Lacute",	0x0139},  /* LATIN CAPITAL LETTER L WITH ACUTE		   */
-  {"Lambda",	0x039B},  /* GREEK CAPITAL LETTER LAMDA 		   */
-  {"Larr",	0x219E},  /* LEFTWARDS TWO HEADED ARROW 		   */
-  {"Lcaron",	0x013D},  /* LATIN CAPITAL LETTER L WITH CARON		   */
-  {"Lcedil",	0x013B},  /* LATIN CAPITAL LETTER L WITH CEDILLA	   */
-  {"Lcy",	0x041B},  /* CYRILLIC CAPITAL LETTER EL 		   */
-  {"Lgr",	0x039B},  /* GREEK CAPITAL LETTER LAMDA 		   */
-  {"Ll",	0x22D8},  /* VERY MUCH LESS-THAN			   */
-  {"Lmidot",	0x013F},  /* LATIN CAPITAL LETTER L WITH MIDDLE DOT	   */
-  {"Lstrok",	0x0141},  /* LATIN CAPITAL LETTER L WITH STROKE 	   */
-  {"Lt",	0x226A},  /* MUCH LESS-THAN				   */
-  {"Mcy",	0x041C},  /* CYRILLIC CAPITAL LETTER EM 		   */
-  {"Mgr",	0x039C},  /* GREEK CAPITAL LETTER MU			   */
-  {"Mu",	0x039C},  /* GREEK CAPITAL LETTER MU			   */
-  {"NJcy",	0x040A},  /* CYRILLIC CAPITAL LETTER NJE		   */
-  {"Nacute",	0x0143},  /* LATIN CAPITAL LETTER N WITH ACUTE		   */
-  {"Ncaron",	0x0147},  /* LATIN CAPITAL LETTER N WITH CARON		   */
-  {"Ncedil",	0x0145},  /* LATIN CAPITAL LETTER N WITH CEDILLA	   */
-  {"Ncy",	0x041D},  /* CYRILLIC CAPITAL LETTER EN 		   */
-  {"Ngr",	0x039D},  /* GREEK CAPITAL LETTER NU			   */
-  {"Ntilde",	0x00D1},  /* LATIN CAPITAL LETTER N WITH TILDE		   */
-  {"Nu",	0x039D},  /* GREEK CAPITAL LETTER NU			   */
-  {"OElig",	0x0152},  /* LATIN CAPITAL LIGATURE OE			   */
-  {"OHacgr",	0x038F},  /* GREEK CAPITAL LETTER OMEGA WITH TONOS	   */
-  {"OHgr",	0x03A9},  /* GREEK CAPITAL LETTER OMEGA 		   */
-  {"Oacgr",	0x038C},  /* GREEK CAPITAL LETTER OMICRON WITH TONOS	   */
-  {"Oacute",	0x00D3},  /* LATIN CAPITAL LETTER O WITH ACUTE		   */
-  {"Ocirc",	0x00D4},  /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX	   */
-  {"Ocy",	0x041E},  /* CYRILLIC CAPITAL LETTER O			   */
-  {"Odblac",	0x0150},  /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE	   */
-  {"Ogr",	0x039F},  /* GREEK CAPITAL LETTER OMICRON		   */
-  {"Ograve",	0x00D2},  /* LATIN CAPITAL LETTER O WITH GRAVE		   */
-  {"Omacr",	0x014C},  /* LATIN CAPITAL LETTER O WITH MACRON 	   */
-  {"Omega",	0x03A9},  /* GREEK CAPITAL LETTER OMEGA 		   */
-  {"Omicron",	0x039F},  /* GREEK CAPITAL LETTER OMICRON		   */
-  {"Oslash",	0x00D8},  /* LATIN CAPITAL LETTER O WITH STROKE 	   */
-  {"Otilde",	0x00D5},  /* LATIN CAPITAL LETTER O WITH TILDE		   */
-  {"Ouml",	0x00D6},  /* LATIN CAPITAL LETTER O WITH DIAERESIS	   */
-  {"PHgr",	0x03A6},  /* GREEK CAPITAL LETTER PHI			   */
-  {"PSgr",	0x03A8},  /* GREEK CAPITAL LETTER PSI			   */
-  {"Pcy",	0x041F},  /* CYRILLIC CAPITAL LETTER PE 		   */
-  {"Pgr",	0x03A0},  /* GREEK CAPITAL LETTER PI			   */
-  {"Phi",	0x03A6},  /* GREEK CAPITAL LETTER PHI			   */
-  {"Pi",	0x03A0},  /* GREEK CAPITAL LETTER PI			   */
-  {"Prime",	0x2033},  /* DOUBLE PRIME				   */
-  {"Psi",	0x03A8},  /* GREEK CAPITAL LETTER PSI			   */
-  {"Racute",	0x0154},  /* LATIN CAPITAL LETTER R WITH ACUTE		   */
-  {"Rarr",	0x21A0},  /* RIGHTWARDS TWO HEADED ARROW		   */
-  {"Rcaron",	0x0158},  /* LATIN CAPITAL LETTER R WITH CARON		   */
-  {"Rcedil",	0x0156},  /* LATIN CAPITAL LETTER R WITH CEDILLA	   */
-  {"Rcy",	0x0420},  /* CYRILLIC CAPITAL LETTER ER 		   */
-  {"Rgr",	0x03A1},  /* GREEK CAPITAL LETTER RHO			   */
-  {"Rho",	0x03A1},  /* GREEK CAPITAL LETTER RHO			   */
-  {"SHCHcy",	0x0429},  /* CYRILLIC CAPITAL LETTER SHCHA		   */
-  {"SHcy",	0x0428},  /* CYRILLIC CAPITAL LETTER SHA		   */
-  {"SOFTcy",	0x042C},  /* CYRILLIC CAPITAL LETTER SOFT SIGN		   */
-  {"Sacute",	0x015A},  /* LATIN CAPITAL LETTER S WITH ACUTE		   */
-  {"Scaron",	0x0160},  /* LATIN CAPITAL LETTER S WITH CARON		   */
-  {"Scedil",	0x015E},  /* LATIN CAPITAL LETTER S WITH CEDILLA	   */
-  {"Scirc",	0x015C},  /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX	   */
-  {"Scy",	0x0421},  /* CYRILLIC CAPITAL LETTER ES 		   */
-  {"Sgr",	0x03A3},  /* GREEK CAPITAL LETTER SIGMA 		   */
-  {"Sigma",	0x03A3},  /* GREEK CAPITAL LETTER SIGMA 		   */
-  {"Sub",	0x22D0},  /* DOUBLE SUBSET				   */
-  {"Sup",	0x22D1},  /* DOUBLE SUPERSET				   */
-  {"THORN",	0x00DE},  /* LATIN CAPITAL LETTER THORN 		   */
-  {"THgr",	0x0398},  /* GREEK CAPITAL LETTER THETA 		   */
-  {"TSHcy",	0x040B},  /* CYRILLIC CAPITAL LETTER TSHE		   */
-  {"TScy",	0x0426},  /* CYRILLIC CAPITAL LETTER TSE		   */
-  {"Tau",	0x03A4},  /* GREEK CAPITAL LETTER TAU			   */
-  {"Tcaron",	0x0164},  /* LATIN CAPITAL LETTER T WITH CARON		   */
-  {"Tcedil",	0x0162},  /* LATIN CAPITAL LETTER T WITH CEDILLA	   */
-  {"Tcy",	0x0422},  /* CYRILLIC CAPITAL LETTER TE 		   */
-  {"Tgr",	0x03A4},  /* GREEK CAPITAL LETTER TAU			   */
-  {"Theta",	0x0398},  /* GREEK CAPITAL LETTER THETA 		   */
-  {"Tstrok",	0x0166},  /* LATIN CAPITAL LETTER T WITH STROKE 	   */
-  {"Uacgr",	0x038E},  /* GREEK CAPITAL LETTER UPSILON WITH TONOS	   */
-  {"Uacute",	0x00DA},  /* LATIN CAPITAL LETTER U WITH ACUTE		   */
-  {"Ubrcy",	0x040E},  /* CYRILLIC CAPITAL LETTER SHORT U		   */
-  {"Ubreve",	0x016C},  /* LATIN CAPITAL LETTER U WITH BREVE		   */
-  {"Ucirc",	0x00DB},  /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX	   */
-  {"Ucy",	0x0423},  /* CYRILLIC CAPITAL LETTER U			   */
-  {"Udblac",	0x0170},  /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE	   */
-  {"Udigr",	0x03AB},  /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA   */
-  {"Ugr",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
-  {"Ugrave",	0x00D9},  /* LATIN CAPITAL LETTER U WITH GRAVE		   */
-  {"Umacr",	0x016A},  /* LATIN CAPITAL LETTER U WITH MACRON 	   */
-  {"Uogon",	0x0172},  /* LATIN CAPITAL LETTER U WITH OGONEK 	   */
-  {"Upsi",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
-  {"Upsilon",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
-  {"Uring",	0x016E},  /* LATIN CAPITAL LETTER U WITH RING ABOVE	   */
-  {"Utilde",	0x0168},  /* LATIN CAPITAL LETTER U WITH TILDE		   */
-  {"Uuml",	0x00DC},  /* LATIN CAPITAL LETTER U WITH DIAERESIS	   */
-  {"Vcy",	0x0412},  /* CYRILLIC CAPITAL LETTER VE 		   */
-  {"Vdash",	0x22A9},  /* FORCES					   */
-  {"Verbar",	0x2016},  /* DOUBLE VERTICAL LINE			   */
-  {"Vvdash",	0x22AA},  /* TRIPLE VERTICAL BAR RIGHT TURNSTILE	   */
-  {"Wcirc",	0x0174},  /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX	   */
-  {"Xgr",	0x039E},  /* GREEK CAPITAL LETTER XI			   */
-  {"Xi",	0x039E},  /* GREEK CAPITAL LETTER XI			   */
-  {"YAcy",	0x042F},  /* CYRILLIC CAPITAL LETTER YA 		   */
-  {"YIcy",	0x0407},  /* CYRILLIC CAPITAL LETTER YI 		   */
-  {"YUcy",	0x042E},  /* CYRILLIC CAPITAL LETTER YU 		   */
-  {"Yacute",	0x00DD},  /* LATIN CAPITAL LETTER Y WITH ACUTE		   */
-  {"Ycirc",	0x0176},  /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX	   */
-  {"Ycy",	0x042B},  /* CYRILLIC CAPITAL LETTER YERU		   */
-  {"Yuml",	0x0178},  /* LATIN CAPITAL LETTER Y WITH DIAERESIS	   */
-  {"ZHcy",	0x0416},  /* CYRILLIC CAPITAL LETTER ZHE		   */
-  {"Zacute",	0x0179},  /* LATIN CAPITAL LETTER Z WITH ACUTE		   */
-  {"Zcaron",	0x017D},  /* LATIN CAPITAL LETTER Z WITH CARON		   */
-  {"Zcy",	0x0417},  /* CYRILLIC CAPITAL LETTER ZE 		   */
-  {"Zdot",	0x017B},  /* LATIN CAPITAL LETTER Z WITH DOT ABOVE	   */
-  {"Zeta",	0x0396},  /* GREEK CAPITAL LETTER ZETA			   */
-  {"Zgr",	0x0396},  /* GREEK CAPITAL LETTER ZETA			   */
-  {"aacgr",	0x03AC},  /* GREEK SMALL LETTER ALPHA WITH TONOS	   */
-  {"aacute",	0x00E1},  /* LATIN SMALL LETTER A WITH ACUTE		   */
-  {"abreve",	0x0103},  /* LATIN SMALL LETTER A WITH BREVE		   */
-  {"acirc",	0x00E2},  /* LATIN SMALL LETTER A WITH CIRCUMFLEX	   */
-  {"acute",	0x00B4},  /* ACUTE ACCENT				   */
-  {"acy",	0x0430},  /* CYRILLIC SMALL LETTER A			   */
-  {"aelig",	0x00E6},  /* LATIN SMALL LETTER AE			   */
-  {"agr",	0x03B1},  /* GREEK SMALL LETTER ALPHA			   */
-  {"agrave",	0x00E0},  /* LATIN SMALL LETTER A WITH GRAVE		   */
-  {"alefsym",	0x2135},  /* ALEF SYMBOL				   */
-  {"aleph",	0x2135},  /* ALEF SYMBOL				   */
-  {"alpha",	0x03B1},  /* GREEK SMALL LETTER ALPHA			   */
-  {"amacr",	0x0101},  /* LATIN SMALL LETTER A WITH MACRON		   */
-  {"amalg",	0x2210},  /* N-ARY COPRODUCT				   */
-  {"amp",	0x0026},  /* AMPERSAND					   */
-  {"and",	0x2227},  /* LOGICAL AND				   */
-  {"ang",	0x2220},  /* ANGLE					   */
-  {"ang90",	0x221F},  /* RIGHT ANGLE				   */
-  {"angmsd",	0x2221},  /* MEASURED ANGLE				   */
-  {"angsph",	0x2222},  /* SPHERICAL ANGLE				   */
-  {"angst",	0x212B},  /* ANGSTROM SIGN				   */
-  {"aogon",	0x0105},  /* LATIN SMALL LETTER A WITH OGONEK		   */
-  {"ap",	0x2248},  /* ALMOST EQUAL TO				   */
-  {"ape",	0x224A},  /* ALMOST EQUAL OR EQUAL TO			   */
-  {"apos",	0x02BC},  /* MODIFIER LETTER APOSTROPHE 		   */
-  {"aring",	0x00E5},  /* LATIN SMALL LETTER A WITH RING ABOVE	   */
-  {"ast",	0x002A},  /* ASTERISK					   */
-  {"asymp",	0x2248},  /* ALMOST EQUAL TO				   */
-  {"atilde",	0x00E3},  /* LATIN SMALL LETTER A WITH TILDE		   */
-  {"auml",	0x00E4},  /* LATIN SMALL LETTER A WITH DIAERESIS	   */
-  {"b.Delta",	0x0394},  /* GREEK CAPITAL LETTER DELTA 		   */
-  {"b.Gamma",	0x0393},  /* GREEK CAPITAL LETTER GAMMA 		   */
-  {"b.Lambda",	0x039B},  /* GREEK CAPITAL LETTER LAMDA 		   */
-  {"b.Omega",	0x03A9},  /* GREEK CAPITAL LETTER OMEGA 		   */
-  {"b.Phi",	0x03A6},  /* GREEK CAPITAL LETTER PHI			   */
-  {"b.Pi",	0x03A0},  /* GREEK CAPITAL LETTER PI			   */
-  {"b.Psi",	0x03A8},  /* GREEK CAPITAL LETTER PSI			   */
-  {"b.Sigma",	0x03A3},  /* GREEK CAPITAL LETTER SIGMA 		   */
-  {"b.Theta",	0x0398},  /* GREEK CAPITAL LETTER THETA 		   */
-  {"b.Upsi",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
-  {"b.Xi",	0x039E},  /* GREEK CAPITAL LETTER XI			   */
-  {"b.alpha",	0x03B1},  /* GREEK SMALL LETTER ALPHA			   */
-  {"b.beta",	0x03B2},  /* GREEK SMALL LETTER BETA			   */
-  {"b.chi",	0x03C7},  /* GREEK SMALL LETTER CHI			   */
-  {"b.delta",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
-  {"b.epsi",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
-  {"b.epsis",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
-  {"b.epsiv",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
-  {"b.eta",	0x03B7},  /* GREEK SMALL LETTER ETA			   */
-  {"b.gamma",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
-  {"b.gammad",	0x03DC},  /* GREEK LETTER DIGAMMA			   */
-  {"b.iota",	0x03B9},  /* GREEK SMALL LETTER IOTA			   */
-  {"b.kappa",	0x03BA},  /* GREEK SMALL LETTER KAPPA			   */
-  {"b.kappav",	0x03F0},  /* GREEK KAPPA SYMBOL 			   */
-  {"b.lambda",	0x03BB},  /* GREEK SMALL LETTER LAMDA			   */
-  {"b.mu",	0x03BC},  /* GREEK SMALL LETTER MU			   */
-  {"b.nu",	0x03BD},  /* GREEK SMALL LETTER NU			   */
-  {"b.omega",	0x03CE},  /* GREEK SMALL LETTER OMEGA WITH TONOS	   */
-  {"b.phis",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
-  {"b.phiv",	0x03D5},  /* GREEK PHI SYMBOL				   */
-  {"b.pi",	0x03C0},  /* GREEK SMALL LETTER PI			   */
-  {"b.piv",	0x03D6},  /* GREEK PI SYMBOL				   */
-  {"b.psi",	0x03C8},  /* GREEK SMALL LETTER PSI			   */
-  {"b.rho",	0x03C1},  /* GREEK SMALL LETTER RHO			   */
-  {"b.rhov",	0x03F1},  /* GREEK RHO SYMBOL				   */
-  {"b.sigma",	0x03C3},  /* GREEK SMALL LETTER SIGMA			   */
-  {"b.sigmav",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
-  {"b.tau",	0x03C4},  /* GREEK SMALL LETTER TAU			   */
-  {"b.thetas",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
-  {"b.thetav",	0x03D1},  /* GREEK THETA SYMBOL 			   */
-  {"b.upsi",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
-  {"b.xi",	0x03BE},  /* GREEK SMALL LETTER XI			   */
-  {"b.zeta",	0x03B6},  /* GREEK SMALL LETTER ZETA			   */
-  {"barwed",	0x22BC},  /* NAND					   */
-  {"bcong",	0x224C},  /* ALL EQUAL TO				   */
-  {"bcy",	0x0431},  /* CYRILLIC SMALL LETTER BE			   */
-  {"bdquo",	0x201E},  /* DOUBLE LOW-9 QUOTATION MARK		   */
-  {"becaus",	0x2235},  /* BECAUSE					   */
-  {"bepsi",	0x220D},  /* SMALL CONTAINS AS MEMBER			   */
-  {"bernou",	0x212C},  /* SCRIPT CAPITAL B				   */
-  {"beta",	0x03B2},  /* GREEK SMALL LETTER BETA			   */
-  {"beth",	0x2136},  /* BET SYMBOL 				   */
-  {"bgr",	0x03B2},  /* GREEK SMALL LETTER BETA			   */
-  {"blank",	0x2423},  /* OPEN BOX					   */
-  {"blk12",	0x2592},  /* MEDIUM SHADE				   */
-  {"blk14",	0x2591},  /* LIGHT SHADE				   */
-  {"blk34",	0x2593},  /* DARK SHADE 				   */
-  {"block",	0x2588},  /* FULL BLOCK 				   */
-  {"bottom",	0x22A5},  /* UP TACK					   */
-  {"bowtie",	0x22C8},  /* BOWTIE					   */
-  {"boxDL",	0x2557},  /* BOX DRAWINGS DOUBLE DOWN AND LEFT		   */
-  {"boxDR",	0x2554},  /* BOX DRAWINGS DOUBLE DOWN AND RIGHT 	   */
-  {"boxDl",	0x2556},  /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE	   */
-  {"boxDr",	0x2553},  /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE	   */
-  {"boxH",	0x2550},  /* BOX DRAWINGS DOUBLE HORIZONTAL		   */
-  {"boxHD",	0x2566},  /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL	   */
-  {"boxHU",	0x2569},  /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL	   */
-  {"boxHd",	0x2564},  /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE*/
-  {"boxHu",	0x2567},  /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE  */
-  {"boxUL",	0x255D},  /* BOX DRAWINGS DOUBLE UP AND LEFT		   */
-  {"boxUR",	0x255A},  /* BOX DRAWINGS DOUBLE UP AND RIGHT		   */
-  {"boxUl",	0x255C},  /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE	   */
-  {"boxUr",	0x2559},  /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE	   */
-  {"boxV",	0x2551},  /* BOX DRAWINGS DOUBLE VERTICAL		   */
-  {"boxVH",	0x256C},  /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL   */
-  {"boxVL",	0x2563},  /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT	   */
-  {"boxVR",	0x2560},  /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT	   */
-  {"boxVh",	0x256B},  /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SI*/
-  {"boxVl",	0x2562},  /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE  */
-  {"boxVr",	0x255F},  /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
-  {"boxdL",	0x2555},  /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE	   */
-  {"boxdR",	0x2552},  /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE	   */
-  {"boxdl",	0x2510},  /* BOX DRAWINGS LIGHT DOWN AND LEFT		   */
-  {"boxdr",	0x250C},  /* BOX DRAWINGS LIGHT DOWN AND RIGHT		   */
-  {"boxh",	0x2500},  /* BOX DRAWINGS LIGHT HORIZONTAL		   */
-  {"boxhD",	0x2565},  /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE*/
-  {"boxhU",	0x2568},  /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE  */
-  {"boxhd",	0x252C},  /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL	   */
-  {"boxhu",	0x2534},  /* BOX DRAWINGS LIGHT UP AND HORIZONTAL	   */
-  {"boxuL",	0x255B},  /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE	   */
-  {"boxuR",	0x2558},  /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE	   */
-  {"boxul",	0x2518},  /* BOX DRAWINGS LIGHT UP AND LEFT		   */
-  {"boxur",	0x2514},  /* BOX DRAWINGS LIGHT UP AND RIGHT		   */
-  {"boxv",	0x2502},  /* BOX DRAWINGS LIGHT VERTICAL		   */
-  {"boxvH",	0x256A},  /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DO*/
-  {"boxvL",	0x2561},  /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE  */
-  {"boxvR",	0x255E},  /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
-  {"boxvh",	0x253C},  /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL    */
-  {"boxvl",	0x2524},  /* BOX DRAWINGS LIGHT VERTICAL AND LEFT	   */
-  {"boxvr",	0x251C},  /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT	   */
-  {"bprime",	0x2035},  /* REVERSED PRIME				   */
-  {"breve",	0x02D8},  /* BREVE					   */
-  {"brkbar",	0x00A6},  /* obsolete synonym for "brvbar" 0x00A6	   */
-  {"brvbar",	0x00A6},  /* BROKEN BAR 				   */
-  {"bsim",	0x223D},  /* REVERSED TILDE				   */
-  {"bsime",	0x22CD},  /* REVERSED TILDE EQUALS			   */
-  {"bsol",	0x005C},  /* REVERSE SOLIDUS				   */
-  {"bull",	0x2022},  /* BULLET					   */
-  {"bump",	0x224E},  /* GEOMETRICALLY EQUIVALENT TO		   */
-  {"bumpe",	0x224F},  /* DIFFERENCE BETWEEN 			   */
-  {"cacute",	0x0107},  /* LATIN SMALL LETTER C WITH ACUTE		   */
-  {"cap",	0x2229},  /* INTERSECTION				   */
-  {"caret",	0x2041},  /* CARET INSERTION POINT			   */
-  {"caron",	0x02C7},  /* CARON					   */
-  {"ccaron",	0x010D},  /* LATIN SMALL LETTER C WITH CARON		   */
-  {"ccedil",	0x00E7},  /* LATIN SMALL LETTER C WITH CEDILLA		   */
-  {"ccirc",	0x0109},  /* LATIN SMALL LETTER C WITH CIRCUMFLEX	   */
-  {"cdot",	0x010B},  /* LATIN SMALL LETTER C WITH DOT ABOVE	   */
-  {"cedil",	0x00B8},  /* CEDILLA					   */
-  {"cent",	0x00A2},  /* CENT SIGN					   */
-  {"chcy",	0x0447},  /* CYRILLIC SMALL LETTER CHE			   */
-  {"check",	0x2713},  /* CHECK MARK 				   */
-  {"chi",	0x03C7},  /* GREEK SMALL LETTER CHI			   */
-  {"cir",	0x25CB},  /* WHITE CIRCLE				   */
-  {"circ",	0x02C6},  /* MODIFIER LETTER CIRCUMFLEX ACCENT		   */
-  {"cire",	0x2257},  /* RING EQUAL TO				   */
-  {"clubs",	0x2663},  /* BLACK CLUB SUIT				   */
-  {"colon",	0x003A},  /* COLON					   */
-  {"colone",	0x2254},  /* COLON EQUALS				   */
-  {"comma",	0x002C},  /* COMMA					   */
-  {"commat",	0x0040},  /* COMMERCIAL AT				   */
-  {"comp",	0x2201},  /* COMPLEMENT 				   */
-  {"compfn",	0x2218},  /* RING OPERATOR				   */
-  {"cong",	0x2245},  /* APPROXIMATELY EQUAL TO			   */
-  {"conint",	0x222E},  /* CONTOUR INTEGRAL				   */
-  {"coprod",	0x2210},  /* N-ARY COPRODUCT				   */
-  {"copy",	0x00A9},  /* COPYRIGHT SIGN				   */
-  {"copysr",	0x2117},  /* SOUND RECORDING COPYRIGHT			   */
-  {"crarr",	0x21B5},  /* DOWNWARDS ARROW WITH CORNER LEFTWARDS	   */
-  {"cross",	0x2717},  /* BALLOT X					   */
-  {"cuepr",	0x22DE},  /* EQUAL TO OR PRECEDES			   */
-  {"cuesc",	0x22DF},  /* EQUAL TO OR SUCCEEDS			   */
-  {"cularr",	0x21B6},  /* ANTICLOCKWISE TOP SEMICIRCLE ARROW 	   */
-  {"cup",	0x222A},  /* UNION					   */
-  {"cupre",	0x227C},  /* PRECEDES OR EQUAL TO			   */
-  {"curarr",	0x21B7},  /* CLOCKWISE TOP SEMICIRCLE ARROW		   */
-  {"curren",	0x00A4},  /* CURRENCY SIGN				   */
-  {"cuvee",	0x22CE},  /* CURLY LOGICAL OR				   */
-  {"cuwed",	0x22CF},  /* CURLY LOGICAL AND				   */
-  {"dArr",	0x21D3},  /* DOWNWARDS DOUBLE ARROW			   */
-  {"dagger",	0x2020},  /* DAGGER					   */
-  {"daleth",	0x2138},  /* DALET SYMBOL				   */
-  {"darr",	0x2193},  /* DOWNWARDS ARROW				   */
-  {"darr2",	0x21CA},  /* DOWNWARDS PAIRED ARROWS			   */
-  {"dash",	0x2010},  /* HYPHEN					   */
-  {"dashv",	0x22A3},  /* LEFT TACK					   */
-  {"dblac",	0x02DD},  /* DOUBLE ACUTE ACCENT			   */
-  {"dcaron",	0x010F},  /* LATIN SMALL LETTER D WITH CARON		   */
-  {"dcy",	0x0434},  /* CYRILLIC SMALL LETTER DE			   */
-  {"deg",	0x00B0},  /* DEGREE SIGN				   */
-  {"delta",	0x03B4},  /* GREEK SMALL LETTER DELTA			   */
-  {"dgr",	0x03B4},  /* GREEK SMALL LETTER DELTA			   */
-  {"dharl",	0x21C3},  /* DOWNWARDS HARPOON WITH BARB LEFTWARDS	   */
-  {"dharr",	0x21C2},  /* DOWNWARDS HARPOON WITH BARB RIGHTWARDS	   */
-  {"diam",	0x22C4},  /* DIAMOND OPERATOR				   */
-  {"diams",	0x2666},  /* BLACK DIAMOND SUIT 			   */
-  {"die",	0x00A8},  /* DIAERESIS					   */
-  {"divide",	0x00F7},  /* DIVISION SIGN				   */
-  {"divonx",	0x22C7},  /* DIVISION TIMES				   */
-  {"djcy",	0x0452},  /* CYRILLIC SMALL LETTER DJE			   */
-  {"dlarr",	0x2199},  /* SOUTH WEST ARROW				   */
-  {"dlcorn",	0x231E},  /* BOTTOM LEFT CORNER 			   */
-  {"dlcrop",	0x230D},  /* BOTTOM LEFT CROP				   */
-  {"dollar",	0x0024},  /* DOLLAR SIGN				   */
-  {"dot",	0x02D9},  /* DOT ABOVE					   */
-  {"drarr",	0x2198},  /* SOUTH EAST ARROW				   */
-  {"drcorn",	0x231F},  /* BOTTOM RIGHT CORNER			   */
-  {"drcrop",	0x230C},  /* BOTTOM RIGHT CROP				   */
-  {"dscy",	0x0455},  /* CYRILLIC SMALL LETTER DZE			   */
-  {"dstrok",	0x0111},  /* LATIN SMALL LETTER D WITH STROKE		   */
-  {"dtri",	0x25BF},  /* WHITE DOWN-POINTING SMALL TRIANGLE 	   */
-  {"dtrif",	0x25BE},  /* BLACK DOWN-POINTING SMALL TRIANGLE 	   */
-  {"dzcy",	0x045F},  /* CYRILLIC SMALL LETTER DZHE 		   */
-  {"eDot",	0x2251},  /* GEOMETRICALLY EQUAL TO			   */
-  {"eacgr",	0x03AD},  /* GREEK SMALL LETTER EPSILON WITH TONOS	   */
-  {"eacute",	0x00E9},  /* LATIN SMALL LETTER E WITH ACUTE		   */
-  {"ecaron",	0x011B},  /* LATIN SMALL LETTER E WITH CARON		   */
-  {"ecir",	0x2256},  /* RING IN EQUAL TO				   */
-  {"ecirc",	0x00EA},  /* LATIN SMALL LETTER E WITH CIRCUMFLEX	   */
-  {"ecolon",	0x2255},  /* EQUALS COLON				   */
-  {"ecy",	0x044D},  /* CYRILLIC SMALL LETTER E			   */
-  {"edot",	0x0117},  /* LATIN SMALL LETTER E WITH DOT ABOVE	   */
-  {"eeacgr",	0x03AE},  /* GREEK SMALL LETTER ETA WITH TONOS		   */
-  {"eegr",	0x03B7},  /* GREEK SMALL LETTER ETA			   */
-  {"efDot",	0x2252},  /* APPROXIMATELY EQUAL TO OR THE IMAGE OF	   */
-  {"egr",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
-  {"egrave",	0x00E8},  /* LATIN SMALL LETTER E WITH GRAVE		   */
-  {"egs",	0x22DD},  /* EQUAL TO OR GREATER-THAN			   */
-  {"ell",	0x2113},  /* SCRIPT SMALL L				   */
-  {"els",	0x22DC},  /* EQUAL TO OR LESS-THAN			   */
-  {"emacr",	0x0113},  /* LATIN SMALL LETTER E WITH MACRON		   */
-  {"emdash",	0x2014},  /* obsolete synonym for "mdash" 0x2014	   */
-  {"empty",	0x2205},  /* EMPTY SET					   */
-  {"emsp",	0x2003},  /* EM SPACE					   */
-  {"emsp13",	0x2004},  /* THREE-PER-EM SPACE 			   */
-  {"emsp14",	0x2005},  /* FOUR-PER-EM SPACE				   */
-  {"endash",	0x2013},  /* obsolete synonym for "ndash" 0x2013	   */
-  {"eng",	0x014B},  /* LATIN SMALL LETTER ENG			   */
-  {"ensp",	0x2002},  /* EN SPACE					   */
-  {"eogon",	0x0119},  /* LATIN SMALL LETTER E WITH OGONEK		   */
-  {"epsi",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
-  {"epsilon",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
-  {"epsis",	0x220A},  /* SMALL ELEMENT OF				   */
-  {"equals",	0x003D},  /* EQUALS SIGN				   */
-  {"equiv",	0x2261},  /* IDENTICAL TO				   */
-  {"erDot",	0x2253},  /* IMAGE OF OR APPROXIMATELY EQUAL TO 	   */
-  {"esdot",	0x2250},  /* APPROACHES THE LIMIT			   */
-  {"eta",	0x03B7},  /* GREEK SMALL LETTER ETA			   */
-  {"eth",	0x00F0},  /* LATIN SMALL LETTER ETH			   */
-  {"euml",	0x00EB},  /* LATIN SMALL LETTER E WITH DIAERESIS	   */
-  {"excl",	0x0021},  /* EXCLAMATION MARK				   */
-  {"exist",	0x2203},  /* THERE EXISTS				   */
-  {"fcy",	0x0444},  /* CYRILLIC SMALL LETTER EF			   */
-  {"female",	0x2640},  /* FEMALE SIGN				   */
-  {"ffilig",	0xFB03},  /* LATIN SMALL LIGATURE FFI			   */
-  {"fflig",	0xFB00},  /* LATIN SMALL LIGATURE FF			   */
-  {"ffllig",	0xFB04},  /* LATIN SMALL LIGATURE FFL			   */
-  {"filig",	0xFB01},  /* LATIN SMALL LIGATURE FI			   */
-  {"flat",	0x266D},  /* MUSIC FLAT SIGN				   */
-  {"fllig",	0xFB02},  /* LATIN SMALL LIGATURE FL			   */
-  {"fnof",	0x0192},  /* LATIN SMALL LETTER F WITH HOOK		   */
-  {"forall",	0x2200},  /* FOR ALL					   */
-  {"fork",	0x22D4},  /* PITCHFORK					   */
-  {"frac12",	0x00BD},  /* VULGAR FRACTION ONE HALF			   */
-  {"frac13",	0x2153},  /* VULGAR FRACTION ONE THIRD			   */
-  {"frac14",	0x00BC},  /* VULGAR FRACTION ONE QUARTER		   */
-  {"frac15",	0x2155},  /* VULGAR FRACTION ONE FIFTH			   */
-  {"frac16",	0x2159},  /* VULGAR FRACTION ONE SIXTH			   */
-  {"frac18",	0x215B},  /* VULGAR FRACTION ONE EIGHTH 		   */
-  {"frac23",	0x2154},  /* VULGAR FRACTION TWO THIRDS 		   */
-  {"frac25",	0x2156},  /* VULGAR FRACTION TWO FIFTHS 		   */
-  {"frac34",	0x00BE},  /* VULGAR FRACTION THREE QUARTERS		   */
-  {"frac35",	0x2157},  /* VULGAR FRACTION THREE FIFTHS		   */
-  {"frac38",	0x215C},  /* VULGAR FRACTION THREE EIGHTHS		   */
-  {"frac45",	0x2158},  /* VULGAR FRACTION FOUR FIFTHS		   */
-  {"frac56",	0x215A},  /* VULGAR FRACTION FIVE SIXTHS		   */
-  {"frac58",	0x215D},  /* VULGAR FRACTION FIVE EIGHTHS		   */
-  {"frac78",	0x215E},  /* VULGAR FRACTION SEVEN EIGHTHS		   */
-  {"frasl",	0x2044},  /* FRACTION SLASH				   */
-  {"frown",	0x2322},  /* FROWN					   */
-  {"gE",	0x2267},  /* GREATER-THAN OVER EQUAL TO 		   */
-  {"gacute",	0x01F5},  /* LATIN SMALL LETTER G WITH ACUTE		   */
-  {"gamma",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
-  {"gammad",	0x03DC},  /* GREEK LETTER DIGAMMA			   */
-  {"gbreve",	0x011F},  /* LATIN SMALL LETTER G WITH BREVE		   */
-  {"gcedil",	0x0123},  /* LATIN SMALL LETTER G WITH CEDILLA		   */
-  {"gcirc",	0x011D},  /* LATIN SMALL LETTER G WITH CIRCUMFLEX	   */
-  {"gcy",	0x0433},  /* CYRILLIC SMALL LETTER GHE			   */
-  {"gdot",	0x0121},  /* LATIN SMALL LETTER G WITH DOT ABOVE	   */
-  {"ge",	0x2265},  /* GREATER-THAN OR EQUAL TO			   */
-  {"gel",	0x22DB},  /* GREATER-THAN EQUAL TO OR LESS-THAN 	   */
-  {"ges",	0x2265},  /* GREATER-THAN OR EQUAL TO			   */
-  {"ggr",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
-  {"gimel",	0x2137},  /* GIMEL SYMBOL				   */
-  {"gjcy",	0x0453},  /* CYRILLIC SMALL LETTER GJE			   */
-  {"gl",	0x2277},  /* GREATER-THAN OR LESS-THAN			   */
-  {"gnE",	0x2269},  /* GREATER-THAN BUT NOT EQUAL TO		   */
-  {"gne",	0x2269},  /* GREATER-THAN BUT NOT EQUAL TO		   */
-  {"gnsim",	0x22E7},  /* GREATER-THAN BUT NOT EQUIVALENT TO 	   */
-  {"grave",	0x0060},  /* GRAVE ACCENT				   */
-  {"gsdot",	0x22D7},  /* GREATER-THAN WITH DOT			   */
-  {"gsim",	0x2273},  /* GREATER-THAN OR EQUIVALENT TO		   */
-  {"gt",	0x003E},  /* GREATER-THAN SIGN				   */
-  {"gvnE",	0x2269},  /* GREATER-THAN BUT NOT EQUAL TO		   */
-  {"hArr",	0x21D4},  /* LEFT RIGHT DOUBLE ARROW			   */
-  {"hairsp",	0x200A},  /* HAIR SPACE 				   */
-  {"half",	0x00BD},  /* VULGAR FRACTION ONE HALF			   */
-  {"hamilt",	0x210B},  /* SCRIPT CAPITAL H				   */
-  {"hardcy",	0x044A},  /* CYRILLIC SMALL LETTER HARD SIGN		   */
-  {"harr",	0x2194},  /* LEFT RIGHT ARROW				   */
-  {"harrw",	0x21AD},  /* LEFT RIGHT WAVE ARROW			   */
-  {"hcirc",	0x0125},  /* LATIN SMALL LETTER H WITH CIRCUMFLEX	   */
-  {"hearts",	0x2665},  /* BLACK HEART SUIT				   */
-  {"hellip",	0x2026},  /* HORIZONTAL ELLIPSIS			   */
-  {"hibar",	0x00AF},  /* obsolete synonym for "macr" 0x00AF 	   */
-  {"horbar",	0x2015},  /* HORIZONTAL BAR				   */
-  {"hstrok",	0x0127},  /* LATIN SMALL LETTER H WITH STROKE		   */
-  {"hybull",	0x2043},  /* HYPHEN BULLET				   */
-  {"hyphen",	0x002D},  /* HYPHEN-MINUS				   */
-  {"iacgr",	0x03AF},  /* GREEK SMALL LETTER IOTA WITH TONOS 	   */
-  {"iacute",	0x00ED},  /* LATIN SMALL LETTER I WITH ACUTE		   */
-  {"icirc",	0x00EE},  /* LATIN SMALL LETTER I WITH CIRCUMFLEX	   */
-  {"icy",	0x0438},  /* CYRILLIC SMALL LETTER I			   */
-  {"idiagr",	0x0390},  /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TON*/
-  {"idigr",	0x03CA},  /* GREEK SMALL LETTER IOTA WITH DIALYTIKA	   */
-  {"iecy",	0x0435},  /* CYRILLIC SMALL LETTER IE			   */
-  {"iexcl",	0x00A1},  /* INVERTED EXCLAMATION MARK			   */
-  {"iff",	0x21D4},  /* LEFT RIGHT DOUBLE ARROW			   */
-  {"igr",	0x03B9},  /* GREEK SMALL LETTER IOTA			   */
-  {"igrave",	0x00EC},  /* LATIN SMALL LETTER I WITH GRAVE		   */
-  {"ijlig",	0x0133},  /* LATIN SMALL LIGATURE IJ			   */
-  {"imacr",	0x012B},  /* LATIN SMALL LETTER I WITH MACRON		   */
-  {"image",	0x2111},  /* BLACK-LETTER CAPITAL I			   */
-  {"incare",	0x2105},  /* CARE OF					   */
-  {"infin",	0x221E},  /* INFINITY					   */
-  {"inodot",	0x0131},  /* LATIN SMALL LETTER DOTLESS I		   */
-  {"int",	0x222B},  /* INTEGRAL					   */
-  {"intcal",	0x22BA},  /* INTERCALATE				   */
-  {"iocy",	0x0451},  /* CYRILLIC SMALL LETTER IO			   */
-  {"iogon",	0x012F},  /* LATIN SMALL LETTER I WITH OGONEK		   */
-  {"iota",	0x03B9},  /* GREEK SMALL LETTER IOTA			   */
-  {"iquest",	0x00BF},  /* INVERTED QUESTION MARK			   */
-  {"isin",	0x2208},  /* ELEMENT OF 				   */
-  {"itilde",	0x0129},  /* LATIN SMALL LETTER I WITH TILDE		   */
-  {"iukcy",	0x0456},  /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I*/
-  {"iuml",	0x00EF},  /* LATIN SMALL LETTER I WITH DIAERESIS	   */
-  {"jcirc",	0x0135},  /* LATIN SMALL LETTER J WITH CIRCUMFLEX	   */
-  {"jcy",	0x0439},  /* CYRILLIC SMALL LETTER SHORT I		   */
-  {"jsercy",	0x0458},  /* CYRILLIC SMALL LETTER JE			   */
-  {"jukcy",	0x0454},  /* CYRILLIC SMALL LETTER UKRAINIAN IE 	   */
-  {"kappa",	0x03BA},  /* GREEK SMALL LETTER KAPPA			   */
-  {"kappav",	0x03F0},  /* GREEK KAPPA SYMBOL 			   */
-  {"kcedil",	0x0137},  /* LATIN SMALL LETTER K WITH CEDILLA		   */
-  {"kcy",	0x043A},  /* CYRILLIC SMALL LETTER KA			   */
-  {"kgr",	0x03BA},  /* GREEK SMALL LETTER KAPPA			   */
-  {"kgreen",	0x0138},  /* LATIN SMALL LETTER KRA			   */
-  {"khcy",	0x0445},  /* CYRILLIC SMALL LETTER HA			   */
-  {"khgr",	0x03C7},  /* GREEK SMALL LETTER CHI			   */
-  {"kjcy",	0x045C},  /* CYRILLIC SMALL LETTER KJE			   */
-  {"lAarr",	0x21DA},  /* LEFTWARDS TRIPLE ARROW			   */
-  {"lArr",	0x21D0},  /* LEFTWARDS DOUBLE ARROW			   */
-  {"lE",	0x2266},  /* LESS-THAN OVER EQUAL TO			   */
-  {"lacute",	0x013A},  /* LATIN SMALL LETTER L WITH ACUTE		   */
-  {"lagran",	0x2112},  /* SCRIPT CAPITAL L				   */
-  {"lambda",	0x03BB},  /* GREEK SMALL LETTER LAMDA			   */
-  {"lang",	0x2329},  /* LEFT-POINTING ANGLE BRACKET		   */
-  {"laquo",	0x00AB},  /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK	   */
-  {"larr",	0x2190},  /* LEFTWARDS ARROW				   */
-  {"larr2",	0x21C7},  /* LEFTWARDS PAIRED ARROWS			   */
-  {"larrhk",	0x21A9},  /* LEFTWARDS ARROW WITH HOOK			   */
-  {"larrlp",	0x21AB},  /* LEFTWARDS ARROW WITH LOOP			   */
-  {"larrtl",	0x21A2},  /* LEFTWARDS ARROW WITH TAIL			   */
-  {"lcaron",	0x013E},  /* LATIN SMALL LETTER L WITH CARON		   */
-  {"lcedil",	0x013C},  /* LATIN SMALL LETTER L WITH CEDILLA		   */
-  {"lceil",	0x2308},  /* LEFT CEILING				   */
-  {"lcub",	0x007B},  /* LEFT CURLY BRACKET 			   */
-  {"lcy",	0x043B},  /* CYRILLIC SMALL LETTER EL			   */
-  {"ldot",	0x22D6},  /* LESS-THAN WITH DOT 			   */
-  {"ldquo",	0x201C},  /* LEFT DOUBLE QUOTATION MARK 		   */
-  {"ldquor",	0x201E},  /* DOUBLE LOW-9 QUOTATION MARK		   */
-  {"le",	0x2264},  /* LESS-THAN OR EQUAL TO			   */
-  {"leg",	0x22DA},  /* LESS-THAN EQUAL TO OR GREATER-THAN 	   */
-  {"les",	0x2264},  /* LESS-THAN OR EQUAL TO			   */
-  {"lfloor",	0x230A},  /* LEFT FLOOR 				   */
-  {"lg",	0x2276},  /* LESS-THAN OR GREATER-THAN			   */
-  {"lgr",	0x03BB},  /* GREEK SMALL LETTER LAMDA			   */
-  {"lhard",	0x21BD},  /* LEFTWARDS HARPOON WITH BARB DOWNWARDS	   */
-  {"lharu",	0x21BC},  /* LEFTWARDS HARPOON WITH BARB UPWARDS	   */
-  {"lhblk",	0x2584},  /* LOWER HALF BLOCK				   */
-  {"ljcy",	0x0459},  /* CYRILLIC SMALL LETTER LJE			   */
-  {"lmidot",	0x0140},  /* LATIN SMALL LETTER L WITH MIDDLE DOT	   */
-  {"lnE",	0x2268},  /* LESS-THAN BUT NOT EQUAL TO 		   */
-  {"lne",	0x2268},  /* LESS-THAN BUT NOT EQUAL TO 		   */
-  {"lnsim",	0x22E6},  /* LESS-THAN BUT NOT EQUIVALENT TO		   */
-  {"lowast",	0x2217},  /* ASTERISK OPERATOR				   */
-  {"lowbar",	0x005F},  /* LOW LINE					   */
-  {"loz",	0x25CA},  /* LOZENGE					   */
-  {"loz",	0x2727},  /* WHITE FOUR POINTED STAR			   */
-  {"lozf",	0x2726},  /* BLACK FOUR POINTED STAR			   */
-  {"lpar",	0x0028},  /* LEFT PARENTHESIS				   */
-  {"lrarr2",	0x21C6},  /* LEFTWARDS ARROW OVER RIGHTWARDS ARROW	   */
-  {"lrhar2",	0x21CB},  /* LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON	   */
-  {"lrm",	0x200E},  /* LEFT-TO-RIGHT MARK 			   */
-  {"lsaquo",	0x2039},  /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK	   */
-  {"lsh",	0x21B0},  /* UPWARDS ARROW WITH TIP LEFTWARDS		   */
-  {"lsim",	0x2272},  /* LESS-THAN OR EQUIVALENT TO 		   */
-  {"lsqb",	0x005B},  /* LEFT SQUARE BRACKET			   */
-  {"lsquo",	0x2018},  /* LEFT SINGLE QUOTATION MARK 		   */
-  {"lsquor",	0x201A},  /* SINGLE LOW-9 QUOTATION MARK		   */
-  {"lstrok",	0x0142},  /* LATIN SMALL LETTER L WITH STROKE		   */
-  {"lt",	0x003C},  /* LESS-THAN SIGN				   */
-  {"lthree",	0x22CB},  /* LEFT SEMIDIRECT PRODUCT			   */
-  {"ltimes",	0x22C9},  /* LEFT NORMAL FACTOR SEMIDIRECT PRODUCT	   */
-  {"ltri",	0x25C3},  /* WHITE LEFT-POINTING SMALL TRIANGLE 	   */
-  {"ltrie",	0x22B4},  /* NORMAL SUBGROUP OF OR EQUAL TO		   */
-  {"ltrif",	0x25C2},  /* BLACK LEFT-POINTING SMALL TRIANGLE 	   */
-  {"lvnE",	0x2268},  /* LESS-THAN BUT NOT EQUAL TO 		   */
-  {"macr",	0x00AF},  /* MACRON					   */
-  {"male",	0x2642},  /* MALE SIGN					   */
-  {"malt",	0x2720},  /* MALTESE CROSS				   */
-  {"map",	0x21A6},  /* RIGHTWARDS ARROW FROM BAR			   */
-  {"marker",	0x25AE},  /* BLACK VERTICAL RECTANGLE			   */
-  {"mcy",	0x043C},  /* CYRILLIC SMALL LETTER EM			   */
-  {"mdash",	0x2014},  /* EM DASH					   */
-  {"mgr",	0x03BC},  /* GREEK SMALL LETTER MU			   */
-  {"micro",	0x00B5},  /* MICRO SIGN 				   */
-  {"mid",	0x2223},  /* DIVIDES					   */
-  {"middot",	0x00B7},  /* MIDDLE DOT 				   */
-  {"minus",	0x2212},  /* MINUS SIGN 				   */
-  {"minusb",	0x229F},  /* SQUARED MINUS				   */
-  {"mldr",	0x2026},  /* HORIZONTAL ELLIPSIS			   */
-  {"mnplus",	0x2213},  /* MINUS-OR-PLUS SIGN 			   */
-  {"models",	0x22A7},  /* MODELS					   */
-  {"mu",	0x03BC},  /* GREEK SMALL LETTER MU			   */
-  {"mumap",	0x22B8},  /* MULTIMAP					   */
-  {"nVDash",	0x22AF},  /* NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNS*/
-  {"nVdash",	0x22AE},  /* DOES NOT FORCE				   */
-  {"nabla",	0x2207},  /* NABLA					   */
-  {"nacute",	0x0144},  /* LATIN SMALL LETTER N WITH ACUTE		   */
-  {"nap",	0x2249},  /* NOT ALMOST EQUAL TO			   */
-  {"napos",	0x0149},  /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE   */
-  {"natur",	0x266E},  /* MUSIC NATURAL SIGN 			   */
-  {"nbsp",	0x00A0},  /* NO-BREAK SPACE				   */
-  {"ncaron",	0x0148},  /* LATIN SMALL LETTER N WITH CARON		   */
-  {"ncedil",	0x0146},  /* LATIN SMALL LETTER N WITH CEDILLA		   */
-  {"ncong",	0x2247},  /* NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO   */
-  {"ncy",	0x043D},  /* CYRILLIC SMALL LETTER EN			   */
-  {"ndash",	0x2013},  /* EN DASH					   */
-  {"ne",	0x2260},  /* NOT EQUAL TO				   */
-  {"nearr",	0x2197},  /* NORTH EAST ARROW				   */
-  {"nequiv",	0x2262},  /* NOT IDENTICAL TO				   */
-  {"nexist",	0x2204},  /* THERE DOES NOT EXIST			   */
-  {"nge",	0x2271},  /* NEITHER GREATER-THAN NOR EQUAL TO		   */
-  {"nges",	0x2271},  /* NEITHER GREATER-THAN NOR EQUAL TO		   */
-  {"ngr",	0x03BD},  /* GREEK SMALL LETTER NU			   */
-  {"ngt",	0x226F},  /* NOT GREATER-THAN				   */
-  {"nhArr",	0x21CE},  /* LEFT RIGHT DOUBLE ARROW WITH STROKE	   */
-  {"nharr",	0x21AE},  /* LEFT RIGHT ARROW WITH STROKE		   */
-  {"ni",	0x220B},  /* CONTAINS AS MEMBER 			   */
-  {"njcy",	0x045A},  /* CYRILLIC SMALL LETTER NJE			   */
-  {"nlArr",	0x21CD},  /* LEFTWARDS DOUBLE ARROW WITH STROKE 	   */
-  {"nlarr",	0x219A},  /* LEFTWARDS ARROW WITH STROKE		   */
-  {"nldr",	0x2025},  /* TWO DOT LEADER				   */
-  {"nle",	0x2270},  /* NEITHER LESS-THAN NOR EQUAL TO		   */
-  {"nles",	0x2270},  /* NEITHER LESS-THAN NOR EQUAL TO		   */
-  {"nlt",	0x226E},  /* NOT LESS-THAN				   */
-  {"nltri",	0x22EA},  /* NOT NORMAL SUBGROUP OF			   */
-  {"nltrie",	0x22EC},  /* NOT NORMAL SUBGROUP OF OR EQUAL TO 	   */
-  {"nmid",	0x2224},  /* DOES NOT DIVIDE				   */
-  {"not",	0x00AC},  /* NOT SIGN					   */
-  {"notin",	0x2209},  /* NOT AN ELEMENT OF				   */
-  {"npar",	0x2226},  /* NOT PARALLEL TO				   */
-  {"npr",	0x2280},  /* DOES NOT PRECEDE				   */
-  {"npre",	0x22E0},  /* DOES NOT PRECEDE OR EQUAL			   */
-  {"nrArr",	0x21CF},  /* RIGHTWARDS DOUBLE ARROW WITH STROKE	   */
-  {"nrarr",	0x219B},  /* RIGHTWARDS ARROW WITH STROKE		   */
-  {"nrtri",	0x22EB},  /* DOES NOT CONTAIN AS NORMAL SUBGROUP	   */
-  {"nrtrie",	0x22ED},  /* DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL  */
-  {"nsc",	0x2281},  /* DOES NOT SUCCEED				   */
-  {"nsce",	0x22E1},  /* DOES NOT SUCCEED OR EQUAL			   */
-  {"nsim",	0x2241},  /* NOT TILDE					   */
-  {"nsime",	0x2244},  /* NOT ASYMPTOTICALLY EQUAL TO		   */
-  {"nspar",	0x2226},  /* NOT PARALLEL TO				   */
-  {"nsub",	0x2284},  /* NOT A SUBSET OF				   */
-  {"nsubE",	0x2288},  /* NEITHER A SUBSET OF NOR EQUAL TO		   */
-  {"nsube",	0x2288},  /* NEITHER A SUBSET OF NOR EQUAL TO		   */
-  {"nsup",	0x2285},  /* NOT A SUPERSET OF				   */
-  {"nsupE",	0x2289},  /* NEITHER A SUPERSET OF NOR EQUAL TO 	   */
-  {"nsupe",	0x2289},  /* NEITHER A SUPERSET OF NOR EQUAL TO 	   */
-  {"ntilde",	0x00F1},  /* LATIN SMALL LETTER N WITH TILDE		   */
-  {"nu",	0x03BD},  /* GREEK SMALL LETTER NU			   */
-  {"num",	0x0023},  /* NUMBER SIGN				   */
-  {"numero",	0x2116},  /* NUMERO SIGN				   */
-  {"numsp",	0x2007},  /* FIGURE SPACE				   */
-  {"nvDash",	0x22AD},  /* NOT TRUE					   */
-  {"nvdash",	0x22AC},  /* DOES NOT PROVE				   */
-  {"nwarr",	0x2196},  /* NORTH WEST ARROW				   */
-  {"oS",	0x24C8},  /* CIRCLED LATIN CAPITAL LETTER S		   */
-  {"oacgr",	0x03CC},  /* GREEK SMALL LETTER OMICRON WITH TONOS	   */
-  {"oacute",	0x00F3},  /* LATIN SMALL LETTER O WITH ACUTE		   */
-  {"oast",	0x229B},  /* CIRCLED ASTERISK OPERATOR			   */
-  {"ocir",	0x229A},  /* CIRCLED RING OPERATOR			   */
-  {"ocirc",	0x00F4},  /* LATIN SMALL LETTER O WITH CIRCUMFLEX	   */
-  {"ocy",	0x043E},  /* CYRILLIC SMALL LETTER O			   */
-  {"odash",	0x229D},  /* CIRCLED DASH				   */
-  {"odblac",	0x0151},  /* LATIN SMALL LETTER O WITH DOUBLE ACUTE	   */
-  {"odot",	0x2299},  /* CIRCLED DOT OPERATOR			   */
-  {"oelig",	0x0153},  /* LATIN SMALL LIGATURE OE			   */
-  {"ogon",	0x02DB},  /* OGONEK					   */
-  {"ogr",	0x03BF},  /* GREEK SMALL LETTER OMICRON 		   */
-  {"ograve",	0x00F2},  /* LATIN SMALL LETTER O WITH GRAVE		   */
-  {"ohacgr",	0x03CE},  /* GREEK SMALL LETTER OMEGA WITH TONOS	   */
-  {"ohgr",	0x03C9},  /* GREEK SMALL LETTER OMEGA			   */
-  {"ohm",	0x2126},  /* OHM SIGN					   */
-  {"olarr",	0x21BA},  /* ANTICLOCKWISE OPEN CIRCLE ARROW		   */
-  {"oline",	0x203E},  /* OVERLINE					   */
-  {"omacr",	0x014D},  /* LATIN SMALL LETTER O WITH MACRON		   */
-  {"omega",	0x03C9},  /* GREEK SMALL LETTER OMEGA			   */
-  {"omicron",	0x03BF},  /* GREEK SMALL LETTER OMICRON 		   */
-  {"ominus",	0x2296},  /* CIRCLED MINUS				   */
-  {"oplus",	0x2295},  /* CIRCLED PLUS				   */
-  {"or",	0x2228},  /* LOGICAL OR 				   */
-  {"orarr",	0x21BB},  /* CLOCKWISE OPEN CIRCLE ARROW		   */
-  {"order",	0x2134},  /* SCRIPT SMALL O				   */
-  {"ordf",	0x00AA},  /* FEMININE ORDINAL INDICATOR 		   */
-  {"ordm",	0x00BA},  /* MASCULINE ORDINAL INDICATOR		   */
-  {"oslash",	0x00F8},  /* LATIN SMALL LETTER O WITH STROKE		   */
-  {"osol",	0x2298},  /* CIRCLED DIVISION SLASH			   */
-  {"otilde",	0x00F5},  /* LATIN SMALL LETTER O WITH TILDE		   */
-  {"otimes",	0x2297},  /* CIRCLED TIMES				   */
-  {"ouml",	0x00F6},  /* LATIN SMALL LETTER O WITH DIAERESIS	   */
-  {"par",	0x2225},  /* PARALLEL TO				   */
-  {"para",	0x00B6},  /* PILCROW SIGN				   */
-  {"part",	0x2202},  /* PARTIAL DIFFERENTIAL			   */
-  {"pcy",	0x043F},  /* CYRILLIC SMALL LETTER PE			   */
-  {"percnt",	0x0025},  /* PERCENT SIGN				   */
-  {"period",	0x002E},  /* FULL STOP					   */
-  {"permil",	0x2030},  /* PER MILLE SIGN				   */
-  {"perp",	0x22A5},  /* UP TACK					   */
-  {"pgr",	0x03C0},  /* GREEK SMALL LETTER PI			   */
-  {"phgr",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
-  {"phi",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
-  {"phis",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
-  {"phiv",	0x03D5},  /* GREEK PHI SYMBOL				   */
-  {"phmmat",	0x2133},  /* SCRIPT CAPITAL M				   */
-  {"phone",	0x260E},  /* BLACK TELEPHONE				   */
-  {"pi",	0x03C0},  /* GREEK SMALL LETTER PI			   */
-  {"piv",	0x03D6},  /* GREEK PI SYMBOL				   */
-  {"planck",	0x210F},  /* PLANCK CONSTANT OVER TWO PI		   */
-  {"plus",	0x002B},  /* PLUS SIGN					   */
-  {"plusb",	0x229E},  /* SQUARED PLUS				   */
-  {"plusdo",	0x2214},  /* DOT PLUS					   */
-  {"plusmn",	0x00B1},  /* PLUS-MINUS SIGN				   */
-  {"pound",	0x00A3},  /* POUND SIGN 				   */
-  {"pr",	0x227A},  /* PRECEDES					   */
-  {"pre",	0x227C},  /* PRECEDES OR EQUAL TO			   */
-  {"prime",	0x2032},  /* PRIME					   */
-  {"prnsim",	0x22E8},  /* PRECEDES BUT NOT EQUIVALENT TO		   */
-  {"prod",	0x220F},  /* N-ARY PRODUCT				   */
-  {"prop",	0x221D},  /* PROPORTIONAL TO				   */
-  {"prsim",	0x227E},  /* PRECEDES OR EQUIVALENT TO			   */
-  {"psgr",	0x03C8},  /* GREEK SMALL LETTER PSI			   */
-  {"psi",	0x03C8},  /* GREEK SMALL LETTER PSI			   */
-  {"puncsp",	0x2008},  /* PUNCTUATION SPACE				   */
-  {"quest",	0x003F},  /* QUESTION MARK				   */
-  {"quot",	0x0022},  /* QUOTATION MARK				   */
-  {"rAarr",	0x21DB},  /* RIGHTWARDS TRIPLE ARROW			   */
-  {"rArr",	0x21D2},  /* RIGHTWARDS DOUBLE ARROW			   */
-  {"racute",	0x0155},  /* LATIN SMALL LETTER R WITH ACUTE		   */
-  {"radic",	0x221A},  /* SQUARE ROOT				   */
-  {"rang",	0x232A},  /* RIGHT-POINTING ANGLE BRACKET		   */
-  {"raquo",	0x00BB},  /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK    */
-  {"rarr",	0x2192},  /* RIGHTWARDS ARROW				   */
-  {"rarr2",	0x21C9},  /* RIGHTWARDS PAIRED ARROWS			   */
-  {"rarrhk",	0x21AA},  /* RIGHTWARDS ARROW WITH HOOK 		   */
-  {"rarrlp",	0x21AC},  /* RIGHTWARDS ARROW WITH LOOP 		   */
-  {"rarrtl",	0x21A3},  /* RIGHTWARDS ARROW WITH TAIL 		   */
-  {"rarrw",	0x219D},  /* RIGHTWARDS WAVE ARROW			   */
-  {"rcaron",	0x0159},  /* LATIN SMALL LETTER R WITH CARON		   */
-  {"rcedil",	0x0157},  /* LATIN SMALL LETTER R WITH CEDILLA		   */
-  {"rceil",	0x2309},  /* RIGHT CEILING				   */
-  {"rcub",	0x007D},  /* RIGHT CURLY BRACKET			   */
-  {"rcy",	0x0440},  /* CYRILLIC SMALL LETTER ER			   */
-  {"rdquo",	0x201D},  /* RIGHT DOUBLE QUOTATION MARK		   */
-  {"rdquor",	0x201C},  /* LEFT DOUBLE QUOTATION MARK 		   */
-  {"real",	0x211C},  /* BLACK-LETTER CAPITAL R			   */
-  {"rect",	0x25AD},  /* WHITE RECTANGLE				   */
-  {"reg",	0x00AE},  /* REGISTERED SIGN				   */
-  {"rfloor",	0x230B},  /* RIGHT FLOOR				   */
-  {"rgr",	0x03C1},  /* GREEK SMALL LETTER RHO			   */
-  {"rhard",	0x21C1},  /* RIGHTWARDS HARPOON WITH BARB DOWNWARDS	   */
-  {"rharu",	0x21C0},  /* RIGHTWARDS HARPOON WITH BARB UPWARDS	   */
-  {"rho",	0x03C1},  /* GREEK SMALL LETTER RHO			   */
-  {"rhov",	0x03F1},  /* GREEK RHO SYMBOL				   */
-  {"ring",	0x02DA},  /* RING ABOVE 				   */
-  {"rlarr2",	0x21C4},  /* RIGHTWARDS ARROW OVER LEFTWARDS ARROW	   */
-  {"rlhar2",	0x21CC},  /* RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON	   */
-  {"rlm",	0x200F},  /* RIGHT-TO-LEFT MARK 			   */
-  {"rpar",	0x0029},  /* RIGHT PARENTHESIS				   */
-  {"rsaquo",	0x203A},  /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK    */
-  {"rsh",	0x21B1},  /* UPWARDS ARROW WITH TIP RIGHTWARDS		   */
-  {"rsqb",	0x005D},  /* RIGHT SQUARE BRACKET			   */
-  {"rsquo",	0x2019},  /* RIGHT SINGLE QUOTATION MARK		   */
-  {"rsquor",	0x2018},  /* LEFT SINGLE QUOTATION MARK 		   */
-  {"rthree",	0x22CC},  /* RIGHT SEMIDIRECT PRODUCT			   */
-  {"rtimes",	0x22CA},  /* RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT	   */
-  {"rtri",	0x25B9},  /* WHITE RIGHT-POINTING SMALL TRIANGLE	   */
-  {"rtrie",	0x22B5},  /* CONTAINS AS NORMAL SUBGROUP OR EQUAL TO	   */
-  {"rtrif",	0x25B8},  /* BLACK RIGHT-POINTING SMALL TRIANGLE	   */
-  {"rx",	0x211E},  /* PRESCRIPTION TAKE				   */
-  {"sacute",	0x015B},  /* LATIN SMALL LETTER S WITH ACUTE		   */
-  {"samalg",	0x2210},  /* N-ARY COPRODUCT				   */
-  {"sbquo",	0x201A},  /* SINGLE LOW-9 QUOTATION MARK		   */
-  {"sbsol",	0x005C},  /* REVERSE SOLIDUS				   */
-  {"sc",	0x227B},  /* SUCCEEDS					   */
-  {"scaron",	0x0161},  /* LATIN SMALL LETTER S WITH CARON		   */
-  {"sccue",	0x227D},  /* SUCCEEDS OR EQUAL TO			   */
-  {"sce",	0x227D},  /* SUCCEEDS OR EQUAL TO			   */
-  {"scedil",	0x015F},  /* LATIN SMALL LETTER S WITH CEDILLA		   */
-  {"scirc",	0x015D},  /* LATIN SMALL LETTER S WITH CIRCUMFLEX	   */
-  {"scnsim",	0x22E9},  /* SUCCEEDS BUT NOT EQUIVALENT TO		   */
-  {"scsim",	0x227F},  /* SUCCEEDS OR EQUIVALENT TO			   */
-  {"scy",	0x0441},  /* CYRILLIC SMALL LETTER ES			   */
-  {"sdot",	0x22C5},  /* DOT OPERATOR				   */
-  {"sdotb",	0x22A1},  /* SQUARED DOT OPERATOR			   */
-  {"sect",	0x00A7},  /* SECTION SIGN				   */
-  {"semi",	0x003B},  /* SEMICOLON					   */
-  {"setmn",	0x2216},  /* SET MINUS					   */
-  {"sext",	0x2736},  /* SIX POINTED BLACK STAR			   */
-  {"sfgr",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
-  {"sfrown",	0x2322},  /* FROWN					   */
-  {"sgr",	0x03C3},  /* GREEK SMALL LETTER SIGMA			   */
-  {"sharp",	0x266F},  /* MUSIC SHARP SIGN				   */
-  {"shchcy",	0x0449},  /* CYRILLIC SMALL LETTER SHCHA		   */
-  {"shcy",	0x0448},  /* CYRILLIC SMALL LETTER SHA			   */
-  {"shy",	0x00AD},  /* SOFT HYPHEN				   */
-  {"sigma",	0x03C3},  /* GREEK SMALL LETTER SIGMA			   */
-  {"sigmaf",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
-  {"sigmav",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
-  {"sim",	0x223C},  /* TILDE OPERATOR				   */
-  {"sime",	0x2243},  /* ASYMPTOTICALLY EQUAL TO			   */
-  {"smile",	0x2323},  /* SMILE					   */
-  {"softcy",	0x044C},  /* CYRILLIC SMALL LETTER SOFT SIGN		   */
-  {"sol",	0x002F},  /* SOLIDUS					   */
-  {"spades",	0x2660},  /* BLACK SPADE SUIT				   */
-  {"spar",	0x2225},  /* PARALLEL TO				   */
-  {"sqcap",	0x2293},  /* SQUARE CAP 				   */
-  {"sqcup",	0x2294},  /* SQUARE CUP 				   */
-  {"sqsub",	0x228F},  /* SQUARE IMAGE OF				   */
-  {"sqsube",	0x2291},  /* SQUARE IMAGE OF OR EQUAL TO		   */
-  {"sqsup",	0x2290},  /* SQUARE ORIGINAL OF 			   */
-  {"sqsupe",	0x2292},  /* SQUARE ORIGINAL OF OR EQUAL TO		   */
-  {"squ",	0x25A1},  /* WHITE SQUARE				   */
-  {"square",	0x25A1},  /* WHITE SQUARE				   */
-  {"squf",	0x25AA},  /* BLACK SMALL SQUARE 			   */
-  {"ssetmn",	0x2216},  /* SET MINUS					   */
-  {"ssmile",	0x2323},  /* SMILE					   */
-  {"sstarf",	0x22C6},  /* STAR OPERATOR				   */
-  {"star",	0x2606},  /* WHITE STAR 				   */
-  {"starf",	0x2605},  /* BLACK STAR 				   */
-  {"sub",	0x2282},  /* SUBSET OF					   */
-  {"subE",	0x2286},  /* SUBSET OF OR EQUAL TO			   */
-  {"sube",	0x2286},  /* SUBSET OF OR EQUAL TO			   */
-  {"subnE",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
-  {"subne",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
-  {"sum",	0x2211},  /* N-ARY SUMMATION				   */
-  {"sung",	0x266A},  /* EIGHTH NOTE				   */
-  {"sup",	0x2283},  /* SUPERSET OF				   */
-  {"sup1",	0x00B9},  /* SUPERSCRIPT ONE				   */
-  {"sup2",	0x00B2},  /* SUPERSCRIPT TWO				   */
-  {"sup3",	0x00B3},  /* SUPERSCRIPT THREE				   */
-  {"supE",	0x2287},  /* SUPERSET OF OR EQUAL TO			   */
-  {"supe",	0x2287},  /* SUPERSET OF OR EQUAL TO			   */
-  {"supnE",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
-  {"supne",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
-  {"szlig",	0x00DF},  /* LATIN SMALL LETTER SHARP S 		   */
-  {"target",	0x2316},  /* POSITION INDICATOR 			   */
-  {"tau",	0x03C4},  /* GREEK SMALL LETTER TAU			   */
-  {"tcaron",	0x0165},  /* LATIN SMALL LETTER T WITH CARON		   */
-  {"tcedil",	0x0163},  /* LATIN SMALL LETTER T WITH CEDILLA		   */
-  {"tcy",	0x0442},  /* CYRILLIC SMALL LETTER TE			   */
-  {"tdot",	0x20DB},  /* COMBINING THREE DOTS ABOVE 		   */
-  {"telrec",	0x2315},  /* TELEPHONE RECORDER 			   */
-  {"tgr",	0x03C4},  /* GREEK SMALL LETTER TAU			   */
-  {"there4",	0x2234},  /* THEREFORE					   */
-  {"theta",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
-  {"thetas",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
-  {"thetasym",	0x03D1},  /* GREEK THETA SYMBOL 			   */
-  {"thetav",	0x03D1},  /* GREEK THETA SYMBOL 			   */
-  {"thgr",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
-  {"thinsp",	0x2009},  /* THIN SPACE 				   */
-  {"thkap",	0x2248},  /* ALMOST EQUAL TO				   */
-  {"thksim",	0x223C},  /* TILDE OPERATOR				   */
-  {"thorn",	0x00FE},  /* LATIN SMALL LETTER THORN			   */
-  {"tilde",	0x02DC},  /* SMALL TILDE				   */
-  {"times",	0x00D7},  /* MULTIPLICATION SIGN			   */
-  {"timesb",	0x22A0},  /* SQUARED TIMES				   */
-  {"top",	0x22A4},  /* DOWN TACK					   */
-  {"tprime",	0x2034},  /* TRIPLE PRIME				   */
-  {"trade",	0x2122},  /* TRADE MARK SIGN				   */
-  {"trie",	0x225C},  /* DELTA EQUAL TO				   */
-  {"tscy",	0x0446},  /* CYRILLIC SMALL LETTER TSE			   */
-  {"tshcy",	0x045B},  /* CYRILLIC SMALL LETTER TSHE 		   */
-  {"tstrok",	0x0167},  /* LATIN SMALL LETTER T WITH STROKE		   */
-  {"twixt",	0x226C},  /* BETWEEN					   */
-  {"uArr",	0x21D1},  /* UPWARDS DOUBLE ARROW			   */
-  {"uacgr",	0x03CD},  /* GREEK SMALL LETTER UPSILON WITH TONOS	   */
-  {"uacute",	0x00FA},  /* LATIN SMALL LETTER U WITH ACUTE		   */
-  {"uarr",	0x2191},  /* UPWARDS ARROW				   */
-  {"uarr2",	0x21C8},  /* UPWARDS PAIRED ARROWS			   */
-  {"ubrcy",	0x045E},  /* CYRILLIC SMALL LETTER SHORT U		   */
-  {"ubreve",	0x016D},  /* LATIN SMALL LETTER U WITH BREVE		   */
-  {"ucirc",	0x00FB},  /* LATIN SMALL LETTER U WITH CIRCUMFLEX	   */
-  {"ucy",	0x0443},  /* CYRILLIC SMALL LETTER U			   */
-  {"udblac",	0x0171},  /* LATIN SMALL LETTER U WITH DOUBLE ACUTE	   */
-  {"udiagr",	0x03B0},  /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND */
-  {"udigr",	0x03CB},  /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA	   */
-  {"ugr",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
-  {"ugrave",	0x00F9},  /* LATIN SMALL LETTER U WITH GRAVE		   */
-  {"uharl",	0x21BF},  /* UPWARDS HARPOON WITH BARB LEFTWARDS	   */
-  {"uharr",	0x21BE},  /* UPWARDS HARPOON WITH BARB RIGHTWARDS	   */
-  {"uhblk",	0x2580},  /* UPPER HALF BLOCK				   */
-  {"ulcorn",	0x231C},  /* TOP LEFT CORNER				   */
-  {"ulcrop",	0x230F},  /* TOP LEFT CROP				   */
-  {"umacr",	0x016B},  /* LATIN SMALL LETTER U WITH MACRON		   */
-  {"uml",	0x00A8},  /* DIAERESIS					   */
-  {"uogon",	0x0173},  /* LATIN SMALL LETTER U WITH OGONEK		   */
-  {"uplus",	0x228E},  /* MULTISET UNION				   */
-  {"upsi",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
-  {"upsih",	0x03D2},  /* GREEK UPSILON WITH HOOK SYMBOL		   */
-  {"upsilon",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
-  {"urcorn",	0x231D},  /* TOP RIGHT CORNER				   */
-  {"urcrop",	0x230E},  /* TOP RIGHT CROP				   */
-  {"uring",	0x016F},  /* LATIN SMALL LETTER U WITH RING ABOVE	   */
-  {"utilde",	0x0169},  /* LATIN SMALL LETTER U WITH TILDE		   */
-  {"utri",	0x25B5},  /* WHITE UP-POINTING SMALL TRIANGLE		   */
-  {"utrif",	0x25B4},  /* BLACK UP-POINTING SMALL TRIANGLE		   */
-  {"uuml",	0x00FC},  /* LATIN SMALL LETTER U WITH DIAERESIS	   */
-  {"vArr",	0x21D5},  /* UP DOWN DOUBLE ARROW			   */
-  {"vDash",	0x22A8},  /* TRUE					   */
-  {"varr",	0x2195},  /* UP DOWN ARROW				   */
-  {"vcy",	0x0432},  /* CYRILLIC SMALL LETTER VE			   */
-  {"vdash",	0x22A2},  /* RIGHT TACK 				   */
-  {"veebar",	0x22BB},  /* XOR					   */
-  {"vellip",	0x22EE},  /* VERTICAL ELLIPSIS				   */
-  {"verbar",	0x007C},  /* VERTICAL LINE				   */
-  {"vltri",	0x22B2},  /* NORMAL SUBGROUP OF 			   */
-  {"vprime",	0x2032},  /* PRIME					   */
-  {"vprop",	0x221D},  /* PROPORTIONAL TO				   */
-  {"vrtri",	0x22B3},  /* CONTAINS AS NORMAL SUBGROUP		   */
-  {"vsubnE",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
-  {"vsubne",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
-  {"vsupnE",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
-  {"vsupne",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
-  {"wcirc",	0x0175},  /* LATIN SMALL LETTER W WITH CIRCUMFLEX	   */
-  {"wedgeq",	0x2259},  /* ESTIMATES					   */
-  {"weierp",	0x2118},  /* SCRIPT CAPITAL P				   */
-  {"wreath",	0x2240},  /* WREATH PRODUCT				   */
-  {"xcirc",	0x25CB},  /* WHITE CIRCLE				   */
-  {"xdtri",	0x25BD},  /* WHITE DOWN-POINTING TRIANGLE		   */
-  {"xgr",	0x03BE},  /* GREEK SMALL LETTER XI			   */
-  {"xhArr",	0x2194},  /* LEFT RIGHT ARROW				   */
-  {"xharr",	0x2194},  /* LEFT RIGHT ARROW				   */
-  {"xi",	0x03BE},  /* GREEK SMALL LETTER XI			   */
-  {"xlArr",	0x21D0},  /* LEFTWARDS DOUBLE ARROW			   */
-  {"xrArr",	0x21D2},  /* RIGHTWARDS DOUBLE ARROW			   */
-  {"xutri",	0x25B3},  /* WHITE UP-POINTING TRIANGLE 		   */
-  {"yacute",	0x00FD},  /* LATIN SMALL LETTER Y WITH ACUTE		   */
-  {"yacy",	0x044F},  /* CYRILLIC SMALL LETTER YA			   */
-  {"ycirc",	0x0177},  /* LATIN SMALL LETTER Y WITH CIRCUMFLEX	   */
-  {"ycy",	0x044B},  /* CYRILLIC SMALL LETTER YERU 		   */
-  {"yen",	0x00A5},  /* YEN SIGN					   */
-  {"yicy",	0x0457},  /* CYRILLIC SMALL LETTER YI			   */
-  {"yucy",	0x044E},  /* CYRILLIC SMALL LETTER YU			   */
-  {"yuml",	0x00FF},  /* LATIN SMALL LETTER Y WITH DIAERESIS	   */
-  {"zacute",	0x017A},  /* LATIN SMALL LETTER Z WITH ACUTE		   */
-  {"zcaron",	0x017E},  /* LATIN SMALL LETTER Z WITH CARON		   */
-  {"zcy",	0x0437},  /* CYRILLIC SMALL LETTER ZE			   */
-  {"zdot",	0x017C},  /* LATIN SMALL LETTER Z WITH DOT ABOVE	   */
-  {"zeta",	0x03B6},  /* GREEK SMALL LETTER ZETA			   */
-  {"zgr",	0x03B6},  /* GREEK SMALL LETTER ZETA			   */
-  {"zhcy",	0x0436},  /* CYRILLIC SMALL LETTER ZHE			   */
-  {"zwj",	0x200D},  /* ZERO WIDTH JOINER				   */
-  {"zwnj",	0x200C},  /* ZERO WIDTH NON-JOINER			   */
-/* {"epsiv",	0x????},  variant epsilon			 # ISOgrk3 */
-/* {"fjlig",	0x????},  fj ligature				 # ISOpub  */
-/* {"gEl",	0x????},  greater-than, double equals, less-than # ISOamsr */
-/* {"gap",	0x????},  greater-than, approximately equal to	 # ISOamsr */
-/* {"gnap",	0x????},  greater-than, not approximately equal t# ISOamsn */
-/* {"jnodot",	0x????},  latin small letter dotless j		 # ISOamso */
-/* {"lEg",	0x????},  less-than, double equals, greater-than # ISOamsr */
-/* {"lap",	0x????},  less-than, approximately equal to	 # ISOamsr */
-/* {"lnap",	0x????},  less-than, not approximately equal to  # ISOamsn */
-/* {"lpargt",	0x????},  left parenthesis, greater-than	 # ISOamsc */
-/* {"ngE",	0x????},  not greater-than, double equals	 # ISOamsn */
-/* {"nlE",	0x????},  not less-than, double equals		 # ISOamsn */
-/* {"nsmid",	0x????},  nshortmid				 # ISOamsn */
-/* {"prap",	0x????},  precedes, approximately equal to	 # ISOamsr */
-/* {"prnE",	0x????},  precedes, not double equal		 # ISOamsn */
-/* {"prnap",	0x????},  precedes, not approximately equal to	 # ISOamsn */
-/* {"rpargt",	0x????},  right parenthesis, greater-than	 # ISOamsc */
-/* {"scap",	0x????},  succeeds, approximately equal to	 # ISOamsr */
-/* {"scnE",	0x????},  succeeds, not double equals		 # ISOamsn */
-/* {"scnap",	0x????},  succeeds, not approximately equal to	 # ISOamsn */
-/* {"smid",	0x????},  shortmid				 # ISOamsr */
-};
+#include <entities.h>
 
 /*		Attribute Lists
 **		---------------
diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index a20ad2ad..a918f96c 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -377,10 +377,6 @@ PRIVATE int HTMLGen_put_entity ARGS2(
     HTMLGen_put_character(me, '&');
     if (entity_number < nent) {
       HTMLGen_put_string(me, HTML_dtd.entity_names[entity_number]);
-    } else {
-      HTMLGen_put_string(me,
-			 HTML_dtd.extra_entity_info[entity_number-nent].name
-			 );
     }
     HTMLGen_put_character(me, ';');
     return HT_OK;
diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c
index 73feeccc..91a2585b 100644
--- a/WWW/Library/Implementation/HTPlain.c
+++ b/WWW/Library/Implementation/HTPlain.c
@@ -404,12 +404,6 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
 	*/
 	} else if (code == 8194 || code == 8195 || code == 8201) {
 	    HText_appendCharacter(me->text, ' ');
-	/*
-	**  Use ASCII hyphen for 8211 (ndash/endash)
-	**  or 8212 (mdash/emdash). - FM
-	*/
-	} else if (code == 8211 || code == 8212) {
-	    HText_appendCharacter(me->text, '-');
 #endif /* NOTDEFINED */
 
 /******************************************************************
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 61f01f1c..982343c4 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -9,14 +9,15 @@
 **	 6 Feb 93  Binary seraches used. Intreface modified.
 */
 
+#include "HTUtils.h"
+#include "tcp.h"		/* For FROMASCII */
+
 /* Remove the following to disable the experimental HTML DTD parsing.
    Currently only used in this source file. - kw */
 
+#ifndef NO_EXTENDED_HTMLDTD
 #define EXTENDED_HTMLDTD
-
-
-#include "HTUtils.h"
-#include "tcp.h"		/* For FROMASCII */
+#endif
 
 #include "SGML.h"
 #include "HTMLDTD.h"
@@ -197,7 +198,7 @@ PRIVATE void set_chartrans_handling ARGS3(
 	context->current_tag_charset = context->inUCLYhndl;
     } else if (context->T.output_utf8 ||
 	       context->T.trans_from_uni) {
-	context->current_tag_charset = UCGetLYhndl_byMIME("unicode-1-1-utf-8");
+	context->current_tag_charset = UCGetLYhndl_byMIME("utf-8");
     } else {
 	context->current_tag_charset = 0;
     }
@@ -366,6 +367,13 @@ PRIVATE BOOL put_special_unicodes ARGS2(
 	**
 	*/
 	PUTC(HT_EM_SPACE);
+#ifdef NOTUSED_FOTEMODS
+    } else if (code == 8211 || code == 8212) {
+	/*
+	**  Use ASCII hyphen for ndash/endash or mdash/emdash.
+	*/
+	PUTC('-');
+#endif
     } else {
 	/*
 	**  Return NO if nothing done.
@@ -395,8 +403,8 @@ PRIVATE BOOL put_special_unicodes ARGS2(
 PRIVATE char replace_buf [64];	      /* buffer for replacement strings */
 PRIVATE BOOL FoundEntity = FALSE;
 
-#define IncludesLatin1Enc(cs) \
-		(cs == 0 || \
+#define IncludesLatin1Enc \
+		(context->outUCLYhndl == 0 || \
 		 (context->outUCI && \
 		  (context->outUCI->enc & (UCT_CP_SUPERSETOF_LAT1))))
 
@@ -406,12 +414,48 @@ PRIVATE void handle_entity ARGS2(
 {
     UCode_t code;
     long uck;
+    CONST char *p;
     CONST char *s = context->string->data;
+#ifdef NOTUSED_FOTEMODS
     int high, low, i, diff;
 
 
     /*
-    **	Handle named entities.
+    **	Use Lynx special characters for nbsp (160), ensp (8194),
+    **	emsp (8195), thinsp (8201), and shy (173). - FM
+    */
+    if (!strcmp(s, "nbsp")) {
+	PUTC(HT_NON_BREAK_SPACE);
+	FoundEntity = TRUE;
+	return;
+    }
+    if (!strcmp(s, "ensp") || !strcmp(s, "emsp") || !strcmp(s, "thinsp")) {
+	PUTC(HT_EM_SPACE);
+	FoundEntity = TRUE;
+	return;
+    }
+    if (!strcmp(s, "shy")) {
+	PUTC(LY_SOFT_HYPHEN);
+	FoundEntity = TRUE;
+	return;
+    }
+
+    /*
+    **	For ndash or endash (8211), and mdash or emdash (8212),
+    **	use an ASCII hyphen (32). - FM
+    */
+    if (!strcmp(s, "ndash") ||
+	!strcmp(s, "endash") ||
+	!strcmp(s, "mdash") ||
+	!strcmp(s, "endash")) {
+	PUTC('-');
+	FoundEntity = TRUE;
+	return;
+    }
+#endif
+
+    /*
+    **	Handle all other entities normally. - FM
     */
     FoundEntity = FALSE;
     if ((code = HTMLGetEntityUCValue(s)) != 0) {
@@ -424,28 +468,13 @@ PRIVATE void handle_entity ARGS2(
 	    return;
 	}
 	/*
-	**  No special unicodes -
-	**  seek a translation from the chartrans tables.
+	**  Seek a translation from the chartrans tables.
 	*/
 	if ((uck = UCTransUniChar(code, context->outUCLYhndl)) >= 32 &&
 	    uck < 256 &&
 	    (uck < 127 ||
 	     uck >= LYlowest_eightbit[context->outUCLYhndl])) {
-	    if (uck == 160 && IncludesLatin1Enc(context->outUCLYhndl)) {
-		/*
-		**  Would only happen if some other Unicode
-		**  is mapped to Latin-1 160.
-		*/
-		PUTC(HT_NON_BREAK_SPACE);
-	    } else if (uck == 173 && IncludesLatin1Enc(context->outUCLYhndl)) {
-		/*
-		**  Would only happen if some other Unicode
-		**  is mapped to Latin-1 173.
-		*/
-		PUTC(LY_SOFT_HYPHEN);
-	    } else {
-		PUTC(FROMASCII((char)uck));
-	    }
+	    PUTC(FROMASCII((char)uck));
 	    FoundEntity = TRUE;
 	    return;
 	} else if ((uck == -4 ||
@@ -456,7 +485,6 @@ PRIVATE void handle_entity ARGS2(
 		   */
 		   (uck = UCTransUniCharStr(replace_buf, 60, code,
 					    context->outUCLYhndl, 0) >= 0)) {
-	    CONST char *p;
 	    for (p = replace_buf; *p; p++)
 		PUTC(*p);
 	    FoundEntity = TRUE;
@@ -477,6 +505,82 @@ PRIVATE void handle_entity ARGS2(
 	    FoundEntity = TRUE;
 	    return;
 	}
+#ifdef NOTUSED_FOTEMODS
+	/*
+	**  If the value is greater than 255 and we do not
+	**  have the "7-bit approximations" as our output
+	**  character set (in which case we did it already)
+	**  seek a translation for that. - FM
+	*/
+	if ((chk = ((code > 255) &&
+		    context->outUCLYhndl !=
+				   UCGetLYhndl_byMIME("us-ascii"))) &&
+	    (uck = UCTransUniChar(code,
+				   UCGetLYhndl_byMIME("us-ascii")))>= 32 &&
+	    uck < 127) {
+	    /*
+	    **	Got an ASCII character (yippey). - FM
+	    */
+	    PUTC(((char)(uck & 0xff)));
+	    FoundEntity = TRUE;
+	    return;
+	} else if ((chk && uck == -4) &&
+		   (uck = UCTransUniCharStr(replace_buf,
+					    60, code,
+					    UCGetLYhndl_byMIME("us-ascii"),
+					    0) >= 0)) {
+	    /*
+	    **	Got a replacement string (yippey). - FM
+	    */
+	    for (p = replace_buf; *p; p++)
+		PUTC(*p);
+	    FoundEntity = TRUE;
+	    return;
+	}
+    }
+    /*
+    **	Ignore zwnj (8204) and zwj (8205), if we get to here.
+    **	Note that zwnj may have been handled as <WBR>
+    **	by the calling function. - FM
+    */
+    if (!strcmp(s, "zwnj") ||
+	!strcmp(s, "zwj")) {
+	if (TRACE) {
+	    fprintf(stderr, "handle_entity: Ignoring '%s'.\n", s);
+	}
+	FoundEntity = TRUE;
+	return;
+    }
+
+    /*
+    **	Ignore lrm (8206), and rln (8207), if we get to here. - FM
+    */
+    if (!strcmp(s, "lrm") ||
+	!strcmp(s, "rlm")) {
+	if (TRACE) {
+	    fprintf(stderr, "handle_entity: Ignoring '%s'.\n", s);
+	}
+	FoundEntity = TRUE;
+	return;
+    }
+
+    /*
+    **	We haven't succeeded yet, so try the old LYCharSets
+    **	arrays for translation strings. - FM
+    */
+    for (low = 0, high = context->dtd->number_of_entities;
+	 high > low;
+	 diff < 0 ? (low = i+1) : (high = i)) {  /* Binary search */
+	i = (low + (high-low)/2);
+	diff = strcmp(entities[i], s);	/* Case sensitive! */
+	if (diff == 0) {		/* success: found it */
+	    for (p = LYCharSets[context->outUCLYhndl][i]; *p; p++) {
+		PUTC(*p);
+	    }
+	    FoundEntity = TRUE;
+	    return;
+	}
+#endif
     }
 
     /*
@@ -485,11 +589,8 @@ PRIVATE void handle_entity ARGS2(
     if (TRACE)
 	fprintf(stderr, "SGML: Unknown entity '%s'\n", s);
     PUTC('&');
-    {
-	CONST char *p;
-	for (p = s; *p; p++) {
-	    PUTC(*p);
-	}
+    for (p = s; *p; p++) {
+	PUTC(*p);
     }
     if (term != '\0')
 	PUTC(term);
@@ -606,6 +707,7 @@ PRIVATE void handle_sgmlatt ARGS1(
     return;
 }
 
+#ifdef EXTENDED_HTMLDTD
 
 PRIVATE BOOL element_valid_within ARGS3(
     HTTag *,	new_tag,
@@ -625,8 +727,6 @@ PRIVATE BOOL element_valid_within ARGS3(
 		(stacked_tag->tagclass & usecontained));
 }
 
-#ifdef EXTENDED_HTMLDTD
-
 extern BOOL New_DTD;
 
 typedef enum {
@@ -1170,7 +1270,7 @@ PRIVATE void SGML_character ARGS2(
 		    *(context->utf_buf_p) = '\0';
 		    clong = context->utf_char;
 		    if (clong < 256) {
-			c = (char)clong;
+			c = ((char)(clong & 0xff));
 		    }
 		    goto top1;
 		} else {
@@ -1225,6 +1325,16 @@ PRIVATE void SGML_character ARGS2(
 	}
     }
 
+#ifdef NOTDEFINED
+    /*
+    **	If we have a koi8-r input and do not have
+    **	koi8-r as the output, save the raw input
+    **	in saved_char_in before we potentially
+    **	convert it to Unicode. - FM
+    */
+    if (context->T.strip_raw_char_in)
+	saved_char_in = c;
+#endif /* NOTDEFINED */
 
     /*
     **	If we want the raw input converted
@@ -1465,8 +1575,8 @@ top1:
 	    **	We got one octet from the conversions, so use it. - FM
 	    */
 	    PUTC(FROMASCII((char)uck));
-	} else if (chk &&
-		   ((uck == -4 ||
+	} else if ((chk &&
+		   (uck == -4 ||
 		    (context->T.repl_translated_C0 &&
 		     uck > 0 && uck < 32))) &&
 		   /*
@@ -1497,13 +1607,11 @@ top1:
 		    (context->T.do_8bitraw && !context->T.trans_from_uni))
 	} else if (unsign_c > 160 && unsign_c < 256 &&
 		   !(PASSHI8BIT || HTCJK != NOCJK) &&
-		   !IncludesLatin1Enc(context->outUCLYhndl)) {
+		   !IncludesLatin1Enc) {
 	    int i;
-	    int value;
 
 	    string->size = 0;
-	    value = (int)(unsign_c - 160);
-	    EntityName = HTMLGetEntityName(value);
+	    EntityName = HTMLGetEntityName((int)(unsign_c - 160));
 	    for (i = 0; EntityName[i]; i++)
 		HTChunkPutc(string, EntityName[i]);
 	    HTChunkTerminate(string);
@@ -1550,10 +1658,44 @@ top1:
 	} else if ((unsigned char)c <
 			LYlowest_eightbit[context->outUCLYhndl] ||
 		   (context->T.trans_from_uni && !HTPassEightBitRaw)) {
-	    sprintf(replace_buf, "U%.2lX", unsign_c);
-	    for (p = replace_buf; *p; p++) {
-		PUTC(*p);
+#ifdef NOTUSED_FOTEMODS
+	    /*
+	    **	If we do not have the "7-bit approximations" as our
+	    **	output character set (in which case we did it already)
+	    **	seek a translation for that.  Otherwise, or if the
+	    **	translation fails, use UHHH notation. - FM
+	    */
+	    if ((chk = (context->outUCLYhndl !=
+			UCGetLYhndl_byMIME("us-ascii"))) &&
+		(uck = UCTransUniChar(unsign_c,
+				      UCGetLYhndl_byMIME("us-ascii")))
+				      >= 32 && uck < 127) {
+		/*
+		**  Got an ASCII character (yippey). - FM
+		*/
+		PUTC(((char)(uck & 0xff)));
+	    } else if ((chk && uck == -4) &&
+		       (uck = UCTransUniCharStr(replace_buf,
+						60, clong,
+						UCGetLYhndl_byMIME("us-ascii"),
+						0) >= 0)) {
+		/*
+		**  Got a replacement string (yippey). - FM
+		*/
+		for (p = replace_buf; *p; p++)
+		    PUTC(*p);
+	    } else {
+		/*
+		**  Out of luck, so use the UHHH notation (ugh). - FM
+		*/
+#endif /* NOTUSED_FOTEMODS */
+		sprintf(replace_buf, "U%.2lX", unsign_c);
+		for (p = replace_buf; *p; p++) {
+		    PUTC(*p);
+		}
+#ifdef NOTUSED_FOTEMODS
 	    }
+#endif /* NOTUSED_FOTEMODS */
 	/*
 	**  If we get to here, pass the character. - FM
 	*/
@@ -1897,13 +2039,11 @@ top1:
 		    context->isHex = FALSE;
 		    context->state = S_text;
 		    break;
-		}
-
+		} else if (put_special_unicodes(context, code)) {
 		    /*
-		**  Check for special Unicodes.
+		    **	We handled the value as a special character,
+		    **	so recycle the terminator or break. - FM
 		    */
-			if (put_special_unicodes(context, code)) {
-
 		    string->size = 0;
 		    context->isHex = FALSE;
 		    context->state = S_text;
@@ -1912,31 +2052,14 @@ top1:
 		    break;
 		}
 		/*
-		**  No special unicodes -
-		**  seek a translation from the chartrans tables.
+		**  Seek a translation from the chartrans tables.
 		*/
 		if ((uck = UCTransUniChar(code,
 					  context->outUCLYhndl)) >= 32 &&
 		    uck < 256 &&
 		    (uck < 127 ||
 		     uck >= LYlowest_eightbit[context->outUCLYhndl])) {
-		    if (uck == 160 &&
-			IncludesLatin1Enc(context->outUCLYhndl)) {
-			/*
-			**  Would only happen if some other Unicode
-			**  is mapped to Latin-1 160.
-			*/
-			PUTC(HT_NON_BREAK_SPACE);
-		    } else if (uck == 173 &&
-			IncludesLatin1Enc(context->outUCLYhndl)) {
-			/*
-			**  Would only happen if some other Unicode
-			**  is mapped to Latin-1 173.
-			*/
-			PUTC(LY_SOFT_HYPHEN);
-		    } else {
-			PUTC(FROMASCII((char)uck));
-		    }
+		    PUTC(FROMASCII((char)uck));
 		} else if ((uck == -4 ||
 			    (context->T.repl_translated_C0 &&
 			     uck > 0 && uck < 32)) &&
@@ -1954,15 +2077,6 @@ top1:
 		*/
 		} else if (context->T.output_utf8 && PUTUTF8(code)) {
 		    ;  /* do nothing more */
-		/*
-		**  Handle trade as named entity. - FM
-		*/
-		} else if (code == 8482) {
-		    string->size = 0;
-		    HTChunkPuts(string, "trade");
-		    context->isHex = FALSE;
-		    context->state = S_entity;
-		    goto top1;
 #ifdef NOTUSED_FOTEMODS
 		/*
 		**  If the value is greater than 255 and we do not
@@ -1998,10 +2112,14 @@ top1:
 			   code == 8206 ||
 			   code == 8207) {
 		    if (TRACE) {
+			string->size--;
+			LYstrncpy(replace_buf,
+				  string->data,
+				  (string->size < 64 ? string->size : 63));
 			fprintf(stderr,
 				"SGML_character: Ignoring '%s%s'.\n",
 				(context->isHex ? "&#x" : "&#"),
-				string->data);
+				replace_buf);
 		    }
 		    string->size = 0;
 		    context->isHex = FALSE;
@@ -2031,12 +2149,6 @@ top1:
 			    !(HTPassHighCtrlRaw || HTCJK != NOCJK)) ||
 			   (code > 127 && code < 160 &&
 			    !HTPassHighCtrlNum)) {
-		    if (code == 8194 || code == 8195 || code == 8201) {
-			/*
-			**  ensp, emsp or thinsp. - FM
-			*/
-			PUTC(HT_EM_SPACE);
-		    } else {
 			/*
 			**  Unhandled or illegal value.  Recover the
 			**  "&#" or "&#x" and digit(s), and recycle
@@ -2055,10 +2167,9 @@ top1:
 			context->isHex = FALSE;
 			context->state = S_text;
 			goto top1;
-		    }
 		} else if (code < 161 ||
 			   HTPassEightBitNum ||
-			   IncludesLatin1Enc(context->outUCLYhndl)) {
+			   IncludesLatin1Enc) {
 		    /*
 		    **	No conversion needed. - FM
 		    */
diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h
index 5daafc73..7b27da6e 100644
--- a/WWW/Library/Implementation/SGML.h
+++ b/WWW/Library/Implementation/SGML.h
@@ -144,6 +144,12 @@ typedef struct {
     size_t              number_of_entities;
     CONST UC_entity_info * extra_entity_info; /* strcmp order by name */
     size_t              number_of_extra_entities;
+			/*
+			**  All calls to extra_entities table should be done
+			**  through HTMLGetEntityUCValue (LYCharSets.c) only.
+			**  Unicode-based extra_entities table now hold *all*
+			**  old-style entities either.
+			*/
 } SGML_dtd;
 
 
diff --git a/WWW/Library/Implementation/entities.h b/WWW/Library/Implementation/entities.h
new file mode 100644
index 00000000..1fcbac53
--- /dev/null
+++ b/WWW/Library/Implementation/entities.h
@@ -0,0 +1,1083 @@
+/*	Extra Entity Names
+**	------------------
+**
+**	This table contains Unicodes in addition to the Names.
+**
+*
+*	Whole entities[] thing above (and much more) now present
+*	in this kind of structure. The structured streams to which
+*	the SGML modules sends its output could then easily have access
+*	to both entity names and unicode values for each (special)
+*	character.  Probably the whole translation to display characters
+*	should be done at that later stage (e.g. in HTML.c).
+*	What's missing is a way for the later stage to return info
+*	to SGML whether the entity could be displayed or not.
+*	(like between SGML_character() and handle_entity() via FoundEntity.)
+*	Well, trying to do that now.
+*	Why keep two structures for entities?  Backward compatibility..
+*/
+
+/* UC_entity_info structure is defined in SGML.h. */
+/* This has to be sorted alphabetically (case-sensitive),
+   bear this in mind when you add some more entities..
+
+This table available from ftp://ftp.unicode.org/MAPPINGS/
+original comment follows:
+
+
+# Author: John Cowan <cowan@ccil.org>
+# Date: 25 July 1997
+#
+# The following table maps SGML character entities from various
+# public sets (namely, ISOamsa, ISOamsb, ISOamsc, ISOamsn, ISOamso,
+# ISOamsr, ISObox, ISOcyr1, ISOcyr2, ISOdia, ISOgrk1, ISOgrk2,
+# ISOgrk3, ISOgrk4, ISOlat1, ISOlat2, ISOnum, ISOpub, ISOtech,
+# HTMLspecial, HTMLsymbol) to corresponding Unicode characters.
+#
+# The table has four tab-separated columns:
+#	Column 1: SGML character entity name
+#	Column 2: SGML public entity set
+#	Column 3: Unicode 2.0 character code
+#	Column 4: Unicode 2.0 character name (UPPER CASE)
+# Entries which don't have Unicode equivalents have "0x????"
+# in Column 3 and a lower case description (from the public entity
+# set DTD) in Column 4.  The mapping is not reversible, because many
+# distinctions are unified away in Unicode, particularly between
+# mathematical symbols.
+#
+# The table is sorted case-blind by SGML character entity name.
+#
+# The contents of this table are drawn from various sources, and
+# are in the public domain.
+#
+*/
+
+/* We just sort it and move column 2 away (line too long, sorry).
+   Also we add a few synonyms (obsolete):
+   "brkbar"  for "brvbar" 0x00A6
+   "emdash"  for "mdash" 0x2014
+   "endash"  for "ndash" 0x2013
+   "hibar"  for "macr" 0x00AF
+   for exact compatibility with entities[] and previous bevavior.
+   BTW, lots of synonyms found in this table, we shouldn't worry about...
+*/
+
+static CONST UC_entity_info extra_entities[] = {
+  {"AElig",	0x00C6},  /* LATIN CAPITAL LETTER AE			   */
+  {"Aacgr",	0x0386},  /* GREEK CAPITAL LETTER ALPHA WITH TONOS	   */
+  {"Aacute",	0x00C1},  /* LATIN CAPITAL LETTER A WITH ACUTE		   */
+  {"Abreve",	0x0102},  /* LATIN CAPITAL LETTER A WITH BREVE		   */
+  {"Acirc",	0x00C2},  /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX	   */
+  {"Acy",	0x0410},  /* CYRILLIC CAPITAL LETTER A			   */
+  {"Agr",	0x0391},  /* GREEK CAPITAL LETTER ALPHA 		   */
+  {"Agrave",	0x00C0},  /* LATIN CAPITAL LETTER A WITH GRAVE		   */
+  {"Alpha",	0x0391},  /* GREEK CAPITAL LETTER ALPHA 		   */
+  {"Amacr",	0x0100},  /* LATIN CAPITAL LETTER A WITH MACRON 	   */
+  {"Aogon",	0x0104},  /* LATIN CAPITAL LETTER A WITH OGONEK 	   */
+  {"Aring",	0x00C5},  /* LATIN CAPITAL LETTER A WITH RING ABOVE	   */
+  {"Atilde",	0x00C3},  /* LATIN CAPITAL LETTER A WITH TILDE		   */
+  {"Auml",	0x00C4},  /* LATIN CAPITAL LETTER A WITH DIAERESIS	   */
+  {"Barwed",	0x2306},  /* PERSPECTIVE				   */
+  {"Bcy",	0x0411},  /* CYRILLIC CAPITAL LETTER BE 		   */
+  {"Beta",	0x0392},  /* GREEK CAPITAL LETTER BETA			   */
+  {"Bgr",	0x0392},  /* GREEK CAPITAL LETTER BETA			   */
+  {"CHcy",	0x0427},  /* CYRILLIC CAPITAL LETTER CHE		   */
+  {"Cacute",	0x0106},  /* LATIN CAPITAL LETTER C WITH ACUTE		   */
+  {"Cap",	0x22D2},  /* DOUBLE INTERSECTION			   */
+  {"Ccaron",	0x010C},  /* LATIN CAPITAL LETTER C WITH CARON		   */
+  {"Ccedil",	0x00C7},  /* LATIN CAPITAL LETTER C WITH CEDILLA	   */
+  {"Ccirc",	0x0108},  /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX	   */
+  {"Cdot",	0x010A},  /* LATIN CAPITAL LETTER C WITH DOT ABOVE	   */
+  {"Chi",	0x03A7},  /* GREEK CAPITAL LETTER CHI			   */
+  {"Cup",	0x22D3},  /* DOUBLE UNION				   */
+  {"DJcy",	0x0402},  /* CYRILLIC CAPITAL LETTER DJE		   */
+  {"DScy",	0x0405},  /* CYRILLIC CAPITAL LETTER DZE		   */
+  {"DZcy",	0x040F},  /* CYRILLIC CAPITAL LETTER DZHE		   */
+  {"Dagger",	0x2021},  /* DOUBLE DAGGER				   */
+  {"Dcaron",	0x010E},  /* LATIN CAPITAL LETTER D WITH CARON		   */
+  {"Dcy",	0x0414},  /* CYRILLIC CAPITAL LETTER DE 		   */
+  {"Delta",	0x0394},  /* GREEK CAPITAL LETTER DELTA 		   */
+  {"Dgr",	0x0394},  /* GREEK CAPITAL LETTER DELTA 		   */
+  {"Dot",	0x00A8},  /* DIAERESIS					   */
+  {"DotDot",	0x20DC},  /* COMBINING FOUR DOTS ABOVE			   */
+  {"Dstrok",	0x0110},  /* LATIN CAPITAL LETTER D WITH STROKE 	   */
+  {"EEacgr",	0x0389},  /* GREEK CAPITAL LETTER ETA WITH TONOS	   */
+  {"EEgr",	0x0397},  /* GREEK CAPITAL LETTER ETA			   */
+  {"ENG",	0x014A},  /* LATIN CAPITAL LETTER ENG			   */
+  {"ETH",	0x00D0},  /* LATIN CAPITAL LETTER ETH			   */
+  {"Eacgr",	0x0388},  /* GREEK CAPITAL LETTER EPSILON WITH TONOS	   */
+  {"Eacute",	0x00C9},  /* LATIN CAPITAL LETTER E WITH ACUTE		   */
+  {"Ecaron",	0x011A},  /* LATIN CAPITAL LETTER E WITH CARON		   */
+  {"Ecirc",	0x00CA},  /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX	   */
+  {"Ecy",	0x042D},  /* CYRILLIC CAPITAL LETTER E			   */
+  {"Edot",	0x0116},  /* LATIN CAPITAL LETTER E WITH DOT ABOVE	   */
+  {"Egr",	0x0395},  /* GREEK CAPITAL LETTER EPSILON		   */
+  {"Egrave",	0x00C8},  /* LATIN CAPITAL LETTER E WITH GRAVE		   */
+  {"Emacr",	0x0112},  /* LATIN CAPITAL LETTER E WITH MACRON 	   */
+  {"Eogon",	0x0118},  /* LATIN CAPITAL LETTER E WITH OGONEK 	   */
+  {"Epsilon",	0x0395},  /* GREEK CAPITAL LETTER EPSILON		   */
+  {"Eta",	0x0397},  /* GREEK CAPITAL LETTER ETA			   */
+  {"Euml",	0x00CB},  /* LATIN CAPITAL LETTER E WITH DIAERESIS	   */
+  {"Fcy",	0x0424},  /* CYRILLIC CAPITAL LETTER EF 		   */
+  {"GJcy",	0x0403},  /* CYRILLIC CAPITAL LETTER GJE		   */
+  {"Gamma",	0x0393},  /* GREEK CAPITAL LETTER GAMMA 		   */
+  {"Gbreve",	0x011E},  /* LATIN CAPITAL LETTER G WITH BREVE		   */
+  {"Gcedil",	0x0122},  /* LATIN CAPITAL LETTER G WITH CEDILLA	   */
+  {"Gcirc",	0x011C},  /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX	   */
+  {"Gcy",	0x0413},  /* CYRILLIC CAPITAL LETTER GHE		   */
+  {"Gdot",	0x0120},  /* LATIN CAPITAL LETTER G WITH DOT ABOVE	   */
+  {"Gg",	0x22D9},  /* VERY MUCH GREATER-THAN			   */
+  {"Ggr",	0x0393},  /* GREEK CAPITAL LETTER GAMMA 		   */
+  {"Gt",	0x226B},  /* MUCH GREATER-THAN				   */
+  {"HARDcy",	0x042A},  /* CYRILLIC CAPITAL LETTER HARD SIGN		   */
+  {"Hcirc",	0x0124},  /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX	   */
+  {"Hstrok",	0x0126},  /* LATIN CAPITAL LETTER H WITH STROKE 	   */
+  {"IEcy",	0x0415},  /* CYRILLIC CAPITAL LETTER IE 		   */
+  {"IJlig",	0x0132},  /* LATIN CAPITAL LIGATURE IJ			   */
+  {"IOcy",	0x0401},  /* CYRILLIC CAPITAL LETTER IO 		   */
+  {"Iacgr",	0x038A},  /* GREEK CAPITAL LETTER IOTA WITH TONOS	   */
+  {"Iacute",	0x00CD},  /* LATIN CAPITAL LETTER I WITH ACUTE		   */
+  {"Icirc",	0x00CE},  /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX	   */
+  {"Icy",	0x0418},  /* CYRILLIC CAPITAL LETTER I			   */
+  {"Idigr",	0x03AA},  /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA	   */
+  {"Idot",	0x0130},  /* LATIN CAPITAL LETTER I WITH DOT ABOVE	   */
+  {"Igr",	0x0399},  /* GREEK CAPITAL LETTER IOTA			   */
+  {"Igrave",	0x00CC},  /* LATIN CAPITAL LETTER I WITH GRAVE		   */
+  {"Imacr",	0x012A},  /* LATIN CAPITAL LETTER I WITH MACRON 	   */
+  {"Iogon",	0x012E},  /* LATIN CAPITAL LETTER I WITH OGONEK 	   */
+  {"Iota",	0x0399},  /* GREEK CAPITAL LETTER IOTA			   */
+  {"Itilde",	0x0128},  /* LATIN CAPITAL LETTER I WITH TILDE		   */
+  {"Iukcy",	0x0406},  /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN*/
+  {"Iuml",	0x00CF},  /* LATIN CAPITAL LETTER I WITH DIAERESIS	   */
+  {"Jcirc",	0x0134},  /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX	   */
+  {"Jcy",	0x0419},  /* CYRILLIC CAPITAL LETTER SHORT I		   */
+  {"Jsercy",	0x0408},  /* CYRILLIC CAPITAL LETTER JE 		   */
+  {"Jukcy",	0x0404},  /* CYRILLIC CAPITAL LETTER UKRAINIAN IE	   */
+  {"KHcy",	0x0425},  /* CYRILLIC CAPITAL LETTER HA 		   */
+  {"KHgr",	0x03A7},  /* GREEK CAPITAL LETTER CHI			   */
+  {"KJcy",	0x040C},  /* CYRILLIC CAPITAL LETTER KJE		   */
+  {"Kappa",	0x039A},  /* GREEK CAPITAL LETTER KAPPA 		   */
+  {"Kcedil",	0x0136},  /* LATIN CAPITAL LETTER K WITH CEDILLA	   */
+  {"Kcy",	0x041A},  /* CYRILLIC CAPITAL LETTER KA 		   */
+  {"Kgr",	0x039A},  /* GREEK CAPITAL LETTER KAPPA 		   */
+  {"LJcy",	0x0409},  /* CYRILLIC CAPITAL LETTER LJE		   */
+  {"Lacute",	0x0139},  /* LATIN CAPITAL LETTER L WITH ACUTE		   */
+  {"Lambda",	0x039B},  /* GREEK CAPITAL LETTER LAMDA 		   */
+  {"Larr",	0x219E},  /* LEFTWARDS TWO HEADED ARROW 		   */
+  {"Lcaron",	0x013D},  /* LATIN CAPITAL LETTER L WITH CARON		   */
+  {"Lcedil",	0x013B},  /* LATIN CAPITAL LETTER L WITH CEDILLA	   */
+  {"Lcy",	0x041B},  /* CYRILLIC CAPITAL LETTER EL 		   */
+  {"Lgr",	0x039B},  /* GREEK CAPITAL LETTER LAMDA 		   */
+  {"Ll",	0x22D8},  /* VERY MUCH LESS-THAN			   */
+  {"Lmidot",	0x013F},  /* LATIN CAPITAL LETTER L WITH MIDDLE DOT	   */
+  {"Lstrok",	0x0141},  /* LATIN CAPITAL LETTER L WITH STROKE 	   */
+  {"Lt",	0x226A},  /* MUCH LESS-THAN				   */
+  {"Mcy",	0x041C},  /* CYRILLIC CAPITAL LETTER EM 		   */
+  {"Mgr",	0x039C},  /* GREEK CAPITAL LETTER MU			   */
+  {"Mu",	0x039C},  /* GREEK CAPITAL LETTER MU			   */
+  {"NJcy",	0x040A},  /* CYRILLIC CAPITAL LETTER NJE		   */
+  {"Nacute",	0x0143},  /* LATIN CAPITAL LETTER N WITH ACUTE		   */
+  {"Ncaron",	0x0147},  /* LATIN CAPITAL LETTER N WITH CARON		   */
+  {"Ncedil",	0x0145},  /* LATIN CAPITAL LETTER N WITH CEDILLA	   */
+  {"Ncy",	0x041D},  /* CYRILLIC CAPITAL LETTER EN 		   */
+  {"Ngr",	0x039D},  /* GREEK CAPITAL LETTER NU			   */
+  {"Ntilde",	0x00D1},  /* LATIN CAPITAL LETTER N WITH TILDE		   */
+  {"Nu",	0x039D},  /* GREEK CAPITAL LETTER NU			   */
+  {"OElig",	0x0152},  /* LATIN CAPITAL LIGATURE OE			   */
+  {"OHacgr",	0x038F},  /* GREEK CAPITAL LETTER OMEGA WITH TONOS	   */
+  {"OHgr",	0x03A9},  /* GREEK CAPITAL LETTER OMEGA 		   */
+  {"Oacgr",	0x038C},  /* GREEK CAPITAL LETTER OMICRON WITH TONOS	   */
+  {"Oacute",	0x00D3},  /* LATIN CAPITAL LETTER O WITH ACUTE		   */
+  {"Ocirc",	0x00D4},  /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX	   */
+  {"Ocy",	0x041E},  /* CYRILLIC CAPITAL LETTER O			   */
+  {"Odblac",	0x0150},  /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE	   */
+  {"Ogr",	0x039F},  /* GREEK CAPITAL LETTER OMICRON		   */
+  {"Ograve",	0x00D2},  /* LATIN CAPITAL LETTER O WITH GRAVE		   */
+  {"Omacr",	0x014C},  /* LATIN CAPITAL LETTER O WITH MACRON 	   */
+  {"Omega",	0x03A9},  /* GREEK CAPITAL LETTER OMEGA 		   */
+  {"Omicron",	0x039F},  /* GREEK CAPITAL LETTER OMICRON		   */
+  {"Oslash",	0x00D8},  /* LATIN CAPITAL LETTER O WITH STROKE 	   */
+  {"Otilde",	0x00D5},  /* LATIN CAPITAL LETTER O WITH TILDE		   */
+  {"Ouml",	0x00D6},  /* LATIN CAPITAL LETTER O WITH DIAERESIS	   */
+  {"PHgr",	0x03A6},  /* GREEK CAPITAL LETTER PHI			   */
+  {"PSgr",	0x03A8},  /* GREEK CAPITAL LETTER PSI			   */
+  {"Pcy",	0x041F},  /* CYRILLIC CAPITAL LETTER PE 		   */
+  {"Pgr",	0x03A0},  /* GREEK CAPITAL LETTER PI			   */
+  {"Phi",	0x03A6},  /* GREEK CAPITAL LETTER PHI			   */
+  {"Pi",	0x03A0},  /* GREEK CAPITAL LETTER PI			   */
+  {"Prime",	0x2033},  /* DOUBLE PRIME				   */
+  {"Psi",	0x03A8},  /* GREEK CAPITAL LETTER PSI			   */
+  {"Racute",	0x0154},  /* LATIN CAPITAL LETTER R WITH ACUTE		   */
+  {"Rarr",	0x21A0},  /* RIGHTWARDS TWO HEADED ARROW		   */
+  {"Rcaron",	0x0158},  /* LATIN CAPITAL LETTER R WITH CARON		   */
+  {"Rcedil",	0x0156},  /* LATIN CAPITAL LETTER R WITH CEDILLA	   */
+  {"Rcy",	0x0420},  /* CYRILLIC CAPITAL LETTER ER 		   */
+  {"Rgr",	0x03A1},  /* GREEK CAPITAL LETTER RHO			   */
+  {"Rho",	0x03A1},  /* GREEK CAPITAL LETTER RHO			   */
+  {"SHCHcy",	0x0429},  /* CYRILLIC CAPITAL LETTER SHCHA		   */
+  {"SHcy",	0x0428},  /* CYRILLIC CAPITAL LETTER SHA		   */
+  {"SOFTcy",	0x042C},  /* CYRILLIC CAPITAL LETTER SOFT SIGN		   */
+  {"Sacute",	0x015A},  /* LATIN CAPITAL LETTER S WITH ACUTE		   */
+  {"Scaron",	0x0160},  /* LATIN CAPITAL LETTER S WITH CARON		   */
+  {"Scedil",	0x015E},  /* LATIN CAPITAL LETTER S WITH CEDILLA	   */
+  {"Scirc",	0x015C},  /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX	   */
+  {"Scy",	0x0421},  /* CYRILLIC CAPITAL LETTER ES 		   */
+  {"Sgr",	0x03A3},  /* GREEK CAPITAL LETTER SIGMA 		   */
+  {"Sigma",	0x03A3},  /* GREEK CAPITAL LETTER SIGMA 		   */
+  {"Sub",	0x22D0},  /* DOUBLE SUBSET				   */
+  {"Sup",	0x22D1},  /* DOUBLE SUPERSET				   */
+  {"THORN",	0x00DE},  /* LATIN CAPITAL LETTER THORN 		   */
+  {"THgr",	0x0398},  /* GREEK CAPITAL LETTER THETA 		   */
+  {"TSHcy",	0x040B},  /* CYRILLIC CAPITAL LETTER TSHE		   */
+  {"TScy",	0x0426},  /* CYRILLIC CAPITAL LETTER TSE		   */
+  {"Tau",	0x03A4},  /* GREEK CAPITAL LETTER TAU			   */
+  {"Tcaron",	0x0164},  /* LATIN CAPITAL LETTER T WITH CARON		   */
+  {"Tcedil",	0x0162},  /* LATIN CAPITAL LETTER T WITH CEDILLA	   */
+  {"Tcy",	0x0422},  /* CYRILLIC CAPITAL LETTER TE 		   */
+  {"Tgr",	0x03A4},  /* GREEK CAPITAL LETTER TAU			   */
+  {"Theta",	0x0398},  /* GREEK CAPITAL LETTER THETA 		   */
+  {"Tstrok",	0x0166},  /* LATIN CAPITAL LETTER T WITH STROKE 	   */
+  {"Uacgr",	0x038E},  /* GREEK CAPITAL LETTER UPSILON WITH TONOS	   */
+  {"Uacute",	0x00DA},  /* LATIN CAPITAL LETTER U WITH ACUTE		   */
+  {"Ubrcy",	0x040E},  /* CYRILLIC CAPITAL LETTER SHORT U		   */
+  {"Ubreve",	0x016C},  /* LATIN CAPITAL LETTER U WITH BREVE		   */
+  {"Ucirc",	0x00DB},  /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX	   */
+  {"Ucy",	0x0423},  /* CYRILLIC CAPITAL LETTER U			   */
+  {"Udblac",	0x0170},  /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE	   */
+  {"Udigr",	0x03AB},  /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA   */
+  {"Ugr",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
+  {"Ugrave",	0x00D9},  /* LATIN CAPITAL LETTER U WITH GRAVE		   */
+  {"Umacr",	0x016A},  /* LATIN CAPITAL LETTER U WITH MACRON 	   */
+  {"Uogon",	0x0172},  /* LATIN CAPITAL LETTER U WITH OGONEK 	   */
+  {"Upsi",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
+  {"Upsilon",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
+  {"Uring",	0x016E},  /* LATIN CAPITAL LETTER U WITH RING ABOVE	   */
+  {"Utilde",	0x0168},  /* LATIN CAPITAL LETTER U WITH TILDE		   */
+  {"Uuml",	0x00DC},  /* LATIN CAPITAL LETTER U WITH DIAERESIS	   */
+  {"Vcy",	0x0412},  /* CYRILLIC CAPITAL LETTER VE 		   */
+  {"Vdash",	0x22A9},  /* FORCES					   */
+  {"Verbar",	0x2016},  /* DOUBLE VERTICAL LINE			   */
+  {"Vvdash",	0x22AA},  /* TRIPLE VERTICAL BAR RIGHT TURNSTILE	   */
+  {"Wcirc",	0x0174},  /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX	   */
+  {"Xgr",	0x039E},  /* GREEK CAPITAL LETTER XI			   */
+  {"Xi",	0x039E},  /* GREEK CAPITAL LETTER XI			   */
+  {"YAcy",	0x042F},  /* CYRILLIC CAPITAL LETTER YA 		   */
+  {"YIcy",	0x0407},  /* CYRILLIC CAPITAL LETTER YI 		   */
+  {"YUcy",	0x042E},  /* CYRILLIC CAPITAL LETTER YU 		   */
+  {"Yacute",	0x00DD},  /* LATIN CAPITAL LETTER Y WITH ACUTE		   */
+  {"Ycirc",	0x0176},  /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX	   */
+  {"Ycy",	0x042B},  /* CYRILLIC CAPITAL LETTER YERU		   */
+  {"Yuml",	0x0178},  /* LATIN CAPITAL LETTER Y WITH DIAERESIS	   */
+  {"ZHcy",	0x0416},  /* CYRILLIC CAPITAL LETTER ZHE		   */
+  {"Zacute",	0x0179},  /* LATIN CAPITAL LETTER Z WITH ACUTE		   */
+  {"Zcaron",	0x017D},  /* LATIN CAPITAL LETTER Z WITH CARON		   */
+  {"Zcy",	0x0417},  /* CYRILLIC CAPITAL LETTER ZE 		   */
+  {"Zdot",	0x017B},  /* LATIN CAPITAL LETTER Z WITH DOT ABOVE	   */
+  {"Zeta",	0x0396},  /* GREEK CAPITAL LETTER ZETA			   */
+  {"Zgr",	0x0396},  /* GREEK CAPITAL LETTER ZETA			   */
+  {"aacgr",	0x03AC},  /* GREEK SMALL LETTER ALPHA WITH TONOS	   */
+  {"aacute",	0x00E1},  /* LATIN SMALL LETTER A WITH ACUTE		   */
+  {"abreve",	0x0103},  /* LATIN SMALL LETTER A WITH BREVE		   */
+  {"acirc",	0x00E2},  /* LATIN SMALL LETTER A WITH CIRCUMFLEX	   */
+  {"acute",	0x00B4},  /* ACUTE ACCENT				   */
+  {"acy",	0x0430},  /* CYRILLIC SMALL LETTER A			   */
+  {"aelig",	0x00E6},  /* LATIN SMALL LETTER AE			   */
+  {"agr",	0x03B1},  /* GREEK SMALL LETTER ALPHA			   */
+  {"agrave",	0x00E0},  /* LATIN SMALL LETTER A WITH GRAVE		   */
+  {"alefsym",	0x2135},  /* ALEF SYMBOL				   */
+  {"aleph",	0x2135},  /* ALEF SYMBOL				   */
+  {"alpha",	0x03B1},  /* GREEK SMALL LETTER ALPHA			   */
+  {"amacr",	0x0101},  /* LATIN SMALL LETTER A WITH MACRON		   */
+  {"amalg",	0x2210},  /* N-ARY COPRODUCT				   */
+  {"amp",	0x0026},  /* AMPERSAND					   */
+  {"and",	0x2227},  /* LOGICAL AND				   */
+  {"ang",	0x2220},  /* ANGLE					   */
+  {"ang90",	0x221F},  /* RIGHT ANGLE				   */
+  {"angmsd",	0x2221},  /* MEASURED ANGLE				   */
+  {"angsph",	0x2222},  /* SPHERICAL ANGLE				   */
+  {"angst",	0x212B},  /* ANGSTROM SIGN				   */
+  {"aogon",	0x0105},  /* LATIN SMALL LETTER A WITH OGONEK		   */
+  {"ap",	0x2248},  /* ALMOST EQUAL TO				   */
+  {"ape",	0x224A},  /* ALMOST EQUAL OR EQUAL TO			   */
+  {"apos",	0x02BC},  /* MODIFIER LETTER APOSTROPHE 		   */
+  {"aring",	0x00E5},  /* LATIN SMALL LETTER A WITH RING ABOVE	   */
+  {"ast",	0x002A},  /* ASTERISK					   */
+  {"asymp",	0x2248},  /* ALMOST EQUAL TO				   */
+  {"atilde",	0x00E3},  /* LATIN SMALL LETTER A WITH TILDE		   */
+  {"auml",	0x00E4},  /* LATIN SMALL LETTER A WITH DIAERESIS	   */
+  {"b.Delta",	0x0394},  /* GREEK CAPITAL LETTER DELTA 		   */
+  {"b.Gamma",	0x0393},  /* GREEK CAPITAL LETTER GAMMA 		   */
+  {"b.Lambda",	0x039B},  /* GREEK CAPITAL LETTER LAMDA 		   */
+  {"b.Omega",	0x03A9},  /* GREEK CAPITAL LETTER OMEGA 		   */
+  {"b.Phi",	0x03A6},  /* GREEK CAPITAL LETTER PHI			   */
+  {"b.Pi",	0x03A0},  /* GREEK CAPITAL LETTER PI			   */
+  {"b.Psi",	0x03A8},  /* GREEK CAPITAL LETTER PSI			   */
+  {"b.Sigma",	0x03A3},  /* GREEK CAPITAL LETTER SIGMA 		   */
+  {"b.Theta",	0x0398},  /* GREEK CAPITAL LETTER THETA 		   */
+  {"b.Upsi",	0x03A5},  /* GREEK CAPITAL LETTER UPSILON		   */
+  {"b.Xi",	0x039E},  /* GREEK CAPITAL LETTER XI			   */
+  {"b.alpha",	0x03B1},  /* GREEK SMALL LETTER ALPHA			   */
+  {"b.beta",	0x03B2},  /* GREEK SMALL LETTER BETA			   */
+  {"b.chi",	0x03C7},  /* GREEK SMALL LETTER CHI			   */
+  {"b.delta",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
+  {"b.epsi",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
+  {"b.epsis",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
+  {"b.epsiv",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
+  {"b.eta",	0x03B7},  /* GREEK SMALL LETTER ETA			   */
+  {"b.gamma",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
+  {"b.gammad",	0x03DC},  /* GREEK LETTER DIGAMMA			   */
+  {"b.iota",	0x03B9},  /* GREEK SMALL LETTER IOTA			   */
+  {"b.kappa",	0x03BA},  /* GREEK SMALL LETTER KAPPA			   */
+  {"b.kappav",	0x03F0},  /* GREEK KAPPA SYMBOL 			   */
+  {"b.lambda",	0x03BB},  /* GREEK SMALL LETTER LAMDA			   */
+  {"b.mu",	0x03BC},  /* GREEK SMALL LETTER MU			   */
+  {"b.nu",	0x03BD},  /* GREEK SMALL LETTER NU			   */
+  {"b.omega",	0x03CE},  /* GREEK SMALL LETTER OMEGA WITH TONOS	   */
+  {"b.phis",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
+  {"b.phiv",	0x03D5},  /* GREEK PHI SYMBOL				   */
+  {"b.pi",	0x03C0},  /* GREEK SMALL LETTER PI			   */
+  {"b.piv",	0x03D6},  /* GREEK PI SYMBOL				   */
+  {"b.psi",	0x03C8},  /* GREEK SMALL LETTER PSI			   */
+  {"b.rho",	0x03C1},  /* GREEK SMALL LETTER RHO			   */
+  {"b.rhov",	0x03F1},  /* GREEK RHO SYMBOL				   */
+  {"b.sigma",	0x03C3},  /* GREEK SMALL LETTER SIGMA			   */
+  {"b.sigmav",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
+  {"b.tau",	0x03C4},  /* GREEK SMALL LETTER TAU			   */
+  {"b.thetas",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
+  {"b.thetav",	0x03D1},  /* GREEK THETA SYMBOL 			   */
+  {"b.upsi",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
+  {"b.xi",	0x03BE},  /* GREEK SMALL LETTER XI			   */
+  {"b.zeta",	0x03B6},  /* GREEK SMALL LETTER ZETA			   */
+  {"barwed",	0x22BC},  /* NAND					   */
+  {"bcong",	0x224C},  /* ALL EQUAL TO				   */
+  {"bcy",	0x0431},  /* CYRILLIC SMALL LETTER BE			   */
+  {"bdquo",	0x201E},  /* DOUBLE LOW-9 QUOTATION MARK		   */
+  {"becaus",	0x2235},  /* BECAUSE					   */
+  {"bepsi",	0x220D},  /* SMALL CONTAINS AS MEMBER			   */
+  {"bernou",	0x212C},  /* SCRIPT CAPITAL B				   */
+  {"beta",	0x03B2},  /* GREEK SMALL LETTER BETA			   */
+  {"beth",	0x2136},  /* BET SYMBOL 				   */
+  {"bgr",	0x03B2},  /* GREEK SMALL LETTER BETA			   */
+  {"blank",	0x2423},  /* OPEN BOX					   */
+  {"blk12",	0x2592},  /* MEDIUM SHADE				   */
+  {"blk14",	0x2591},  /* LIGHT SHADE				   */
+  {"blk34",	0x2593},  /* DARK SHADE 				   */
+  {"block",	0x2588},  /* FULL BLOCK 				   */
+  {"bottom",	0x22A5},  /* UP TACK					   */
+  {"bowtie",	0x22C8},  /* BOWTIE					   */
+  {"boxDL",	0x2557},  /* BOX DRAWINGS DOUBLE DOWN AND LEFT		   */
+  {"boxDR",	0x2554},  /* BOX DRAWINGS DOUBLE DOWN AND RIGHT 	   */
+  {"boxDl",	0x2556},  /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE	   */
+  {"boxDr",	0x2553},  /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE	   */
+  {"boxH",	0x2550},  /* BOX DRAWINGS DOUBLE HORIZONTAL		   */
+  {"boxHD",	0x2566},  /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL	   */
+  {"boxHU",	0x2569},  /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL	   */
+  {"boxHd",	0x2564},  /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE*/
+  {"boxHu",	0x2567},  /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE  */
+  {"boxUL",	0x255D},  /* BOX DRAWINGS DOUBLE UP AND LEFT		   */
+  {"boxUR",	0x255A},  /* BOX DRAWINGS DOUBLE UP AND RIGHT		   */
+  {"boxUl",	0x255C},  /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE	   */
+  {"boxUr",	0x2559},  /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE	   */
+  {"boxV",	0x2551},  /* BOX DRAWINGS DOUBLE VERTICAL		   */
+  {"boxVH",	0x256C},  /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL   */
+  {"boxVL",	0x2563},  /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT	   */
+  {"boxVR",	0x2560},  /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT	   */
+  {"boxVh",	0x256B},  /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SI*/
+  {"boxVl",	0x2562},  /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE  */
+  {"boxVr",	0x255F},  /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
+  {"boxdL",	0x2555},  /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE	   */
+  {"boxdR",	0x2552},  /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE	   */
+  {"boxdl",	0x2510},  /* BOX DRAWINGS LIGHT DOWN AND LEFT		   */
+  {"boxdr",	0x250C},  /* BOX DRAWINGS LIGHT DOWN AND RIGHT		   */
+  {"boxh",	0x2500},  /* BOX DRAWINGS LIGHT HORIZONTAL		   */
+  {"boxhD",	0x2565},  /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE*/
+  {"boxhU",	0x2568},  /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE  */
+  {"boxhd",	0x252C},  /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL	   */
+  {"boxhu",	0x2534},  /* BOX DRAWINGS LIGHT UP AND HORIZONTAL	   */
+  {"boxuL",	0x255B},  /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE	   */
+  {"boxuR",	0x2558},  /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE	   */
+  {"boxul",	0x2518},  /* BOX DRAWINGS LIGHT UP AND LEFT		   */
+  {"boxur",	0x2514},  /* BOX DRAWINGS LIGHT UP AND RIGHT		   */
+  {"boxv",	0x2502},  /* BOX DRAWINGS LIGHT VERTICAL		   */
+  {"boxvH",	0x256A},  /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DO*/
+  {"boxvL",	0x2561},  /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE  */
+  {"boxvR",	0x255E},  /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
+  {"boxvh",	0x253C},  /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL    */
+  {"boxvl",	0x2524},  /* BOX DRAWINGS LIGHT VERTICAL AND LEFT	   */
+  {"boxvr",	0x251C},  /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT	   */
+  {"bprime",	0x2035},  /* REVERSED PRIME				   */
+  {"breve",	0x02D8},  /* BREVE					   */
+  {"brkbar",	0x00A6},  /* obsolete synonym for "brvbar" 0x00A6	   */
+  {"brvbar",	0x00A6},  /* BROKEN BAR 				   */
+  {"bsim",	0x223D},  /* REVERSED TILDE				   */
+  {"bsime",	0x22CD},  /* REVERSED TILDE EQUALS			   */
+  {"bsol",	0x005C},  /* REVERSE SOLIDUS				   */
+  {"bull",	0x2022},  /* BULLET					   */
+  {"bump",	0x224E},  /* GEOMETRICALLY EQUIVALENT TO		   */
+  {"bumpe",	0x224F},  /* DIFFERENCE BETWEEN 			   */
+  {"cacute",	0x0107},  /* LATIN SMALL LETTER C WITH ACUTE		   */
+  {"cap",	0x2229},  /* INTERSECTION				   */
+  {"caret",	0x2041},  /* CARET INSERTION POINT			   */
+  {"caron",	0x02C7},  /* CARON					   */
+  {"ccaron",	0x010D},  /* LATIN SMALL LETTER C WITH CARON		   */
+  {"ccedil",	0x00E7},  /* LATIN SMALL LETTER C WITH CEDILLA		   */
+  {"ccirc",	0x0109},  /* LATIN SMALL LETTER C WITH CIRCUMFLEX	   */
+  {"cdot",	0x010B},  /* LATIN SMALL LETTER C WITH DOT ABOVE	   */
+  {"cedil",	0x00B8},  /* CEDILLA					   */
+  {"cent",	0x00A2},  /* CENT SIGN					   */
+  {"chcy",	0x0447},  /* CYRILLIC SMALL LETTER CHE			   */
+  {"check",	0x2713},  /* CHECK MARK 				   */
+  {"chi",	0x03C7},  /* GREEK SMALL LETTER CHI			   */
+  {"cir",	0x25CB},  /* WHITE CIRCLE				   */
+  {"circ",	0x02C6},  /* MODIFIER LETTER CIRCUMFLEX ACCENT		   */
+  {"cire",	0x2257},  /* RING EQUAL TO				   */
+  {"clubs",	0x2663},  /* BLACK CLUB SUIT				   */
+  {"colon",	0x003A},  /* COLON					   */
+  {"colone",	0x2254},  /* COLON EQUALS				   */
+  {"comma",	0x002C},  /* COMMA					   */
+  {"commat",	0x0040},  /* COMMERCIAL AT				   */
+  {"comp",	0x2201},  /* COMPLEMENT 				   */
+  {"compfn",	0x2218},  /* RING OPERATOR				   */
+  {"cong",	0x2245},  /* APPROXIMATELY EQUAL TO			   */
+  {"conint",	0x222E},  /* CONTOUR INTEGRAL				   */
+  {"coprod",	0x2210},  /* N-ARY COPRODUCT				   */
+  {"copy",	0x00A9},  /* COPYRIGHT SIGN				   */
+  {"copysr",	0x2117},  /* SOUND RECORDING COPYRIGHT			   */
+  {"crarr",	0x21B5},  /* DOWNWARDS ARROW WITH CORNER LEFTWARDS	   */
+  {"cross",	0x2717},  /* BALLOT X					   */
+  {"cuepr",	0x22DE},  /* EQUAL TO OR PRECEDES			   */
+  {"cuesc",	0x22DF},  /* EQUAL TO OR SUCCEEDS			   */
+  {"cularr",	0x21B6},  /* ANTICLOCKWISE TOP SEMICIRCLE ARROW 	   */
+  {"cup",	0x222A},  /* UNION					   */
+  {"cupre",	0x227C},  /* PRECEDES OR EQUAL TO			   */
+  {"curarr",	0x21B7},  /* CLOCKWISE TOP SEMICIRCLE ARROW		   */
+  {"curren",	0x00A4},  /* CURRENCY SIGN				   */
+  {"cuvee",	0x22CE},  /* CURLY LOGICAL OR				   */
+  {"cuwed",	0x22CF},  /* CURLY LOGICAL AND				   */
+  {"dArr",	0x21D3},  /* DOWNWARDS DOUBLE ARROW			   */
+  {"dagger",	0x2020},  /* DAGGER					   */
+  {"daleth",	0x2138},  /* DALET SYMBOL				   */
+  {"darr",	0x2193},  /* DOWNWARDS ARROW				   */
+  {"darr2",	0x21CA},  /* DOWNWARDS PAIRED ARROWS			   */
+  {"dash",	0x2010},  /* HYPHEN					   */
+  {"dashv",	0x22A3},  /* LEFT TACK					   */
+  {"dblac",	0x02DD},  /* DOUBLE ACUTE ACCENT			   */
+  {"dcaron",	0x010F},  /* LATIN SMALL LETTER D WITH CARON		   */
+  {"dcy",	0x0434},  /* CYRILLIC SMALL LETTER DE			   */
+  {"deg",	0x00B0},  /* DEGREE SIGN				   */
+  {"delta",	0x03B4},  /* GREEK SMALL LETTER DELTA			   */
+  {"dgr",	0x03B4},  /* GREEK SMALL LETTER DELTA			   */
+  {"dharl",	0x21C3},  /* DOWNWARDS HARPOON WITH BARB LEFTWARDS	   */
+  {"dharr",	0x21C2},  /* DOWNWARDS HARPOON WITH BARB RIGHTWARDS	   */
+  {"diam",	0x22C4},  /* DIAMOND OPERATOR				   */
+  {"diams",	0x2666},  /* BLACK DIAMOND SUIT 			   */
+  {"die",	0x00A8},  /* DIAERESIS					   */
+  {"divide",	0x00F7},  /* DIVISION SIGN				   */
+  {"divonx",	0x22C7},  /* DIVISION TIMES				   */
+  {"djcy",	0x0452},  /* CYRILLIC SMALL LETTER DJE			   */
+  {"dlarr",	0x2199},  /* SOUTH WEST ARROW				   */
+  {"dlcorn",	0x231E},  /* BOTTOM LEFT CORNER 			   */
+  {"dlcrop",	0x230D},  /* BOTTOM LEFT CROP				   */
+  {"dollar",	0x0024},  /* DOLLAR SIGN				   */
+  {"dot",	0x02D9},  /* DOT ABOVE					   */
+  {"drarr",	0x2198},  /* SOUTH EAST ARROW				   */
+  {"drcorn",	0x231F},  /* BOTTOM RIGHT CORNER			   */
+  {"drcrop",	0x230C},  /* BOTTOM RIGHT CROP				   */
+  {"dscy",	0x0455},  /* CYRILLIC SMALL LETTER DZE			   */
+  {"dstrok",	0x0111},  /* LATIN SMALL LETTER D WITH STROKE		   */
+  {"dtri",	0x25BF},  /* WHITE DOWN-POINTING SMALL TRIANGLE 	   */
+  {"dtrif",	0x25BE},  /* BLACK DOWN-POINTING SMALL TRIANGLE 	   */
+  {"dzcy",	0x045F},  /* CYRILLIC SMALL LETTER DZHE 		   */
+  {"eDot",	0x2251},  /* GEOMETRICALLY EQUAL TO			   */
+  {"eacgr",	0x03AD},  /* GREEK SMALL LETTER EPSILON WITH TONOS	   */
+  {"eacute",	0x00E9},  /* LATIN SMALL LETTER E WITH ACUTE		   */
+  {"ecaron",	0x011B},  /* LATIN SMALL LETTER E WITH CARON		   */
+  {"ecir",	0x2256},  /* RING IN EQUAL TO				   */
+  {"ecirc",	0x00EA},  /* LATIN SMALL LETTER E WITH CIRCUMFLEX	   */
+  {"ecolon",	0x2255},  /* EQUALS COLON				   */
+  {"ecy",	0x044D},  /* CYRILLIC SMALL LETTER E			   */
+  {"edot",	0x0117},  /* LATIN SMALL LETTER E WITH DOT ABOVE	   */
+  {"eeacgr",	0x03AE},  /* GREEK SMALL LETTER ETA WITH TONOS		   */
+  {"eegr",	0x03B7},  /* GREEK SMALL LETTER ETA			   */
+  {"efDot",	0x2252},  /* APPROXIMATELY EQUAL TO OR THE IMAGE OF	   */
+  {"egr",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
+  {"egrave",	0x00E8},  /* LATIN SMALL LETTER E WITH GRAVE		   */
+  {"egs",	0x22DD},  /* EQUAL TO OR GREATER-THAN			   */
+  {"ell",	0x2113},  /* SCRIPT SMALL L				   */
+  {"els",	0x22DC},  /* EQUAL TO OR LESS-THAN			   */
+  {"emacr",	0x0113},  /* LATIN SMALL LETTER E WITH MACRON		   */
+  {"emdash",	0x2014},  /* obsolete synonym for "mdash" 0x2014	   */
+  {"empty",	0x2205},  /* EMPTY SET					   */
+  {"emsp",	0x2003},  /* EM SPACE					   */
+  {"emsp13",	0x2004},  /* THREE-PER-EM SPACE 			   */
+  {"emsp14",	0x2005},  /* FOUR-PER-EM SPACE				   */
+  {"endash",	0x2013},  /* obsolete synonym for "ndash" 0x2013	   */
+  {"eng",	0x014B},  /* LATIN SMALL LETTER ENG			   */
+  {"ensp",	0x2002},  /* EN SPACE					   */
+  {"eogon",	0x0119},  /* LATIN SMALL LETTER E WITH OGONEK		   */
+  {"epsi",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
+  {"epsilon",	0x03B5},  /* GREEK SMALL LETTER EPSILON 		   */
+  {"epsis",	0x220A},  /* SMALL ELEMENT OF				   */
+  {"equals",	0x003D},  /* EQUALS SIGN				   */
+  {"equiv",	0x2261},  /* IDENTICAL TO				   */
+  {"erDot",	0x2253},  /* IMAGE OF OR APPROXIMATELY EQUAL TO 	   */
+  {"esdot",	0x2250},  /* APPROACHES THE LIMIT			   */
+  {"eta",	0x03B7},  /* GREEK SMALL LETTER ETA			   */
+  {"eth",	0x00F0},  /* LATIN SMALL LETTER ETH			   */
+  {"euml",	0x00EB},  /* LATIN SMALL LETTER E WITH DIAERESIS	   */
+  {"excl",	0x0021},  /* EXCLAMATION MARK				   */
+  {"exist",	0x2203},  /* THERE EXISTS				   */
+  {"fcy",	0x0444},  /* CYRILLIC SMALL LETTER EF			   */
+  {"female",	0x2640},  /* FEMALE SIGN				   */
+  {"ffilig",	0xFB03},  /* LATIN SMALL LIGATURE FFI			   */
+  {"fflig",	0xFB00},  /* LATIN SMALL LIGATURE FF			   */
+  {"ffllig",	0xFB04},  /* LATIN SMALL LIGATURE FFL			   */
+  {"filig",	0xFB01},  /* LATIN SMALL LIGATURE FI			   */
+  {"flat",	0x266D},  /* MUSIC FLAT SIGN				   */
+  {"fllig",	0xFB02},  /* LATIN SMALL LIGATURE FL			   */
+  {"fnof",	0x0192},  /* LATIN SMALL LETTER F WITH HOOK		   */
+  {"forall",	0x2200},  /* FOR ALL					   */
+  {"fork",	0x22D4},  /* PITCHFORK					   */
+  {"frac12",	0x00BD},  /* VULGAR FRACTION ONE HALF			   */
+  {"frac13",	0x2153},  /* VULGAR FRACTION ONE THIRD			   */
+  {"frac14",	0x00BC},  /* VULGAR FRACTION ONE QUARTER		   */
+  {"frac15",	0x2155},  /* VULGAR FRACTION ONE FIFTH			   */
+  {"frac16",	0x2159},  /* VULGAR FRACTION ONE SIXTH			   */
+  {"frac18",	0x215B},  /* VULGAR FRACTION ONE EIGHTH 		   */
+  {"frac23",	0x2154},  /* VULGAR FRACTION TWO THIRDS 		   */
+  {"frac25",	0x2156},  /* VULGAR FRACTION TWO FIFTHS 		   */
+  {"frac34",	0x00BE},  /* VULGAR FRACTION THREE QUARTERS		   */
+  {"frac35",	0x2157},  /* VULGAR FRACTION THREE FIFTHS		   */
+  {"frac38",	0x215C},  /* VULGAR FRACTION THREE EIGHTHS		   */
+  {"frac45",	0x2158},  /* VULGAR FRACTION FOUR FIFTHS		   */
+  {"frac56",	0x215A},  /* VULGAR FRACTION FIVE SIXTHS		   */
+  {"frac58",	0x215D},  /* VULGAR FRACTION FIVE EIGHTHS		   */
+  {"frac78",	0x215E},  /* VULGAR FRACTION SEVEN EIGHTHS		   */
+  {"frasl",	0x2044},  /* FRACTION SLASH				   */
+  {"frown",	0x2322},  /* FROWN					   */
+  {"gE",	0x2267},  /* GREATER-THAN OVER EQUAL TO 		   */
+  {"gacute",	0x01F5},  /* LATIN SMALL LETTER G WITH ACUTE		   */
+  {"gamma",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
+  {"gammad",	0x03DC},  /* GREEK LETTER DIGAMMA			   */
+  {"gbreve",	0x011F},  /* LATIN SMALL LETTER G WITH BREVE		   */
+  {"gcedil",	0x0123},  /* LATIN SMALL LETTER G WITH CEDILLA		   */
+  {"gcirc",	0x011D},  /* LATIN SMALL LETTER G WITH CIRCUMFLEX	   */
+  {"gcy",	0x0433},  /* CYRILLIC SMALL LETTER GHE			   */
+  {"gdot",	0x0121},  /* LATIN SMALL LETTER G WITH DOT ABOVE	   */
+  {"ge",	0x2265},  /* GREATER-THAN OR EQUAL TO			   */
+  {"gel",	0x22DB},  /* GREATER-THAN EQUAL TO OR LESS-THAN 	   */
+  {"ges",	0x2265},  /* GREATER-THAN OR EQUAL TO			   */
+  {"ggr",	0x03B3},  /* GREEK SMALL LETTER GAMMA			   */
+  {"gimel",	0x2137},  /* GIMEL SYMBOL				   */
+  {"gjcy",	0x0453},  /* CYRILLIC SMALL LETTER GJE			   */
+  {"gl",	0x2277},  /* GREATER-THAN OR LESS-THAN			   */
+  {"gnE",	0x2269},  /* GREATER-THAN BUT NOT EQUAL TO		   */
+  {"gne",	0x2269},  /* GREATER-THAN BUT NOT EQUAL TO		   */
+  {"gnsim",	0x22E7},  /* GREATER-THAN BUT NOT EQUIVALENT TO 	   */
+  {"grave",	0x0060},  /* GRAVE ACCENT				   */
+  {"gsdot",	0x22D7},  /* GREATER-THAN WITH DOT			   */
+  {"gsim",	0x2273},  /* GREATER-THAN OR EQUIVALENT TO		   */
+  {"gt",	0x003E},  /* GREATER-THAN SIGN				   */
+  {"gvnE",	0x2269},  /* GREATER-THAN BUT NOT EQUAL TO		   */
+  {"hArr",	0x21D4},  /* LEFT RIGHT DOUBLE ARROW			   */
+  {"hairsp",	0x200A},  /* HAIR SPACE 				   */
+  {"half",	0x00BD},  /* VULGAR FRACTION ONE HALF			   */
+  {"hamilt",	0x210B},  /* SCRIPT CAPITAL H				   */
+  {"hardcy",	0x044A},  /* CYRILLIC SMALL LETTER HARD SIGN		   */
+  {"harr",	0x2194},  /* LEFT RIGHT ARROW				   */
+  {"harrw",	0x21AD},  /* LEFT RIGHT WAVE ARROW			   */
+  {"hcirc",	0x0125},  /* LATIN SMALL LETTER H WITH CIRCUMFLEX	   */
+  {"hearts",	0x2665},  /* BLACK HEART SUIT				   */
+  {"hellip",	0x2026},  /* HORIZONTAL ELLIPSIS			   */
+  {"hibar",	0x00AF},  /* obsolete synonym for "macr" 0x00AF 	   */
+  {"horbar",	0x2015},  /* HORIZONTAL BAR				   */
+  {"hstrok",	0x0127},  /* LATIN SMALL LETTER H WITH STROKE		   */
+  {"hybull",	0x2043},  /* HYPHEN BULLET				   */
+  {"hyphen",	0x002D},  /* HYPHEN-MINUS				   */
+  {"iacgr",	0x03AF},  /* GREEK SMALL LETTER IOTA WITH TONOS 	   */
+  {"iacute",	0x00ED},  /* LATIN SMALL LETTER I WITH ACUTE		   */
+  {"icirc",	0x00EE},  /* LATIN SMALL LETTER I WITH CIRCUMFLEX	   */
+  {"icy",	0x0438},  /* CYRILLIC SMALL LETTER I			   */
+  {"idiagr",	0x0390},  /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TON*/
+  {"idigr",	0x03CA},  /* GREEK SMALL LETTER IOTA WITH DIALYTIKA	   */
+  {"iecy",	0x0435},  /* CYRILLIC SMALL LETTER IE			   */
+  {"iexcl",	0x00A1},  /* INVERTED EXCLAMATION MARK			   */
+  {"iff",	0x21D4},  /* LEFT RIGHT DOUBLE ARROW			   */
+  {"igr",	0x03B9},  /* GREEK SMALL LETTER IOTA			   */
+  {"igrave",	0x00EC},  /* LATIN SMALL LETTER I WITH GRAVE		   */
+  {"ijlig",	0x0133},  /* LATIN SMALL LIGATURE IJ			   */
+  {"imacr",	0x012B},  /* LATIN SMALL LETTER I WITH MACRON		   */
+  {"image",	0x2111},  /* BLACK-LETTER CAPITAL I			   */
+  {"incare",	0x2105},  /* CARE OF					   */
+  {"infin",	0x221E},  /* INFINITY					   */
+  {"inodot",	0x0131},  /* LATIN SMALL LETTER DOTLESS I		   */
+  {"int",	0x222B},  /* INTEGRAL					   */
+  {"intcal",	0x22BA},  /* INTERCALATE				   */
+  {"iocy",	0x0451},  /* CYRILLIC SMALL LETTER IO			   */
+  {"iogon",	0x012F},  /* LATIN SMALL LETTER I WITH OGONEK		   */
+  {"iota",	0x03B9},  /* GREEK SMALL LETTER IOTA			   */
+  {"iquest",	0x00BF},  /* INVERTED QUESTION MARK			   */
+  {"isin",	0x2208},  /* ELEMENT OF 				   */
+  {"itilde",	0x0129},  /* LATIN SMALL LETTER I WITH TILDE		   */
+  {"iukcy",	0x0456},  /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I*/
+  {"iuml",	0x00EF},  /* LATIN SMALL LETTER I WITH DIAERESIS	   */
+  {"jcirc",	0x0135},  /* LATIN SMALL LETTER J WITH CIRCUMFLEX	   */
+  {"jcy",	0x0439},  /* CYRILLIC SMALL LETTER SHORT I		   */
+  {"jsercy",	0x0458},  /* CYRILLIC SMALL LETTER JE			   */
+  {"jukcy",	0x0454},  /* CYRILLIC SMALL LETTER UKRAINIAN IE 	   */
+  {"kappa",	0x03BA},  /* GREEK SMALL LETTER KAPPA			   */
+  {"kappav",	0x03F0},  /* GREEK KAPPA SYMBOL 			   */
+  {"kcedil",	0x0137},  /* LATIN SMALL LETTER K WITH CEDILLA		   */
+  {"kcy",	0x043A},  /* CYRILLIC SMALL LETTER KA			   */
+  {"kgr",	0x03BA},  /* GREEK SMALL LETTER KAPPA			   */
+  {"kgreen",	0x0138},  /* LATIN SMALL LETTER KRA			   */
+  {"khcy",	0x0445},  /* CYRILLIC SMALL LETTER HA			   */
+  {"khgr",	0x03C7},  /* GREEK SMALL LETTER CHI			   */
+  {"kjcy",	0x045C},  /* CYRILLIC SMALL LETTER KJE			   */
+  {"lAarr",	0x21DA},  /* LEFTWARDS TRIPLE ARROW			   */
+  {"lArr",	0x21D0},  /* LEFTWARDS DOUBLE ARROW			   */
+  {"lE",	0x2266},  /* LESS-THAN OVER EQUAL TO			   */
+  {"lacute",	0x013A},  /* LATIN SMALL LETTER L WITH ACUTE		   */
+  {"lagran",	0x2112},  /* SCRIPT CAPITAL L				   */
+  {"lambda",	0x03BB},  /* GREEK SMALL LETTER LAMDA			   */
+  {"lang",	0x2329},  /* LEFT-POINTING ANGLE BRACKET		   */
+  {"laquo",	0x00AB},  /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK	   */
+  {"larr",	0x2190},  /* LEFTWARDS ARROW				   */
+  {"larr2",	0x21C7},  /* LEFTWARDS PAIRED ARROWS			   */
+  {"larrhk",	0x21A9},  /* LEFTWARDS ARROW WITH HOOK			   */
+  {"larrlp",	0x21AB},  /* LEFTWARDS ARROW WITH LOOP			   */
+  {"larrtl",	0x21A2},  /* LEFTWARDS ARROW WITH TAIL			   */
+  {"lcaron",	0x013E},  /* LATIN SMALL LETTER L WITH CARON		   */
+  {"lcedil",	0x013C},  /* LATIN SMALL LETTER L WITH CEDILLA		   */
+  {"lceil",	0x2308},  /* LEFT CEILING				   */
+  {"lcub",	0x007B},  /* LEFT CURLY BRACKET 			   */
+  {"lcy",	0x043B},  /* CYRILLIC SMALL LETTER EL			   */
+  {"ldot",	0x22D6},  /* LESS-THAN WITH DOT 			   */
+  {"ldquo",	0x201C},  /* LEFT DOUBLE QUOTATION MARK 		   */
+  {"ldquor",	0x201E},  /* DOUBLE LOW-9 QUOTATION MARK		   */
+  {"le",	0x2264},  /* LESS-THAN OR EQUAL TO			   */
+  {"leg",	0x22DA},  /* LESS-THAN EQUAL TO OR GREATER-THAN 	   */
+  {"les",	0x2264},  /* LESS-THAN OR EQUAL TO			   */
+  {"lfloor",	0x230A},  /* LEFT FLOOR 				   */
+  {"lg",	0x2276},  /* LESS-THAN OR GREATER-THAN			   */
+  {"lgr",	0x03BB},  /* GREEK SMALL LETTER LAMDA			   */
+  {"lhard",	0x21BD},  /* LEFTWARDS HARPOON WITH BARB DOWNWARDS	   */
+  {"lharu",	0x21BC},  /* LEFTWARDS HARPOON WITH BARB UPWARDS	   */
+  {"lhblk",	0x2584},  /* LOWER HALF BLOCK				   */
+  {"ljcy",	0x0459},  /* CYRILLIC SMALL LETTER LJE			   */
+  {"lmidot",	0x0140},  /* LATIN SMALL LETTER L WITH MIDDLE DOT	   */
+  {"lnE",	0x2268},  /* LESS-THAN BUT NOT EQUAL TO 		   */
+  {"lne",	0x2268},  /* LESS-THAN BUT NOT EQUAL TO 		   */
+  {"lnsim",	0x22E6},  /* LESS-THAN BUT NOT EQUIVALENT TO		   */
+  {"lowast",	0x2217},  /* ASTERISK OPERATOR				   */
+  {"lowbar",	0x005F},  /* LOW LINE					   */
+  {"loz",	0x25CA},  /* LOZENGE					   */
+  {"loz",	0x2727},  /* WHITE FOUR POINTED STAR			   */
+  {"lozf",	0x2726},  /* BLACK FOUR POINTED STAR			   */
+  {"lpar",	0x0028},  /* LEFT PARENTHESIS				   */
+  {"lrarr2",	0x21C6},  /* LEFTWARDS ARROW OVER RIGHTWARDS ARROW	   */
+  {"lrhar2",	0x21CB},  /* LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON	   */
+  {"lrm",	0x200E},  /* LEFT-TO-RIGHT MARK 			   */
+  {"lsaquo",	0x2039},  /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK	   */
+  {"lsh",	0x21B0},  /* UPWARDS ARROW WITH TIP LEFTWARDS		   */
+  {"lsim",	0x2272},  /* LESS-THAN OR EQUIVALENT TO 		   */
+  {"lsqb",	0x005B},  /* LEFT SQUARE BRACKET			   */
+  {"lsquo",	0x2018},  /* LEFT SINGLE QUOTATION MARK 		   */
+  {"lsquor",	0x201A},  /* SINGLE LOW-9 QUOTATION MARK		   */
+  {"lstrok",	0x0142},  /* LATIN SMALL LETTER L WITH STROKE		   */
+  {"lt",	0x003C},  /* LESS-THAN SIGN				   */
+  {"lthree",	0x22CB},  /* LEFT SEMIDIRECT PRODUCT			   */
+  {"ltimes",	0x22C9},  /* LEFT NORMAL FACTOR SEMIDIRECT PRODUCT	   */
+  {"ltri",	0x25C3},  /* WHITE LEFT-POINTING SMALL TRIANGLE 	   */
+  {"ltrie",	0x22B4},  /* NORMAL SUBGROUP OF OR EQUAL TO		   */
+  {"ltrif",	0x25C2},  /* BLACK LEFT-POINTING SMALL TRIANGLE 	   */
+  {"lvnE",	0x2268},  /* LESS-THAN BUT NOT EQUAL TO 		   */
+  {"macr",	0x00AF},  /* MACRON					   */
+  {"male",	0x2642},  /* MALE SIGN					   */
+  {"malt",	0x2720},  /* MALTESE CROSS				   */
+  {"map",	0x21A6},  /* RIGHTWARDS ARROW FROM BAR			   */
+  {"marker",	0x25AE},  /* BLACK VERTICAL RECTANGLE			   */
+  {"mcy",	0x043C},  /* CYRILLIC SMALL LETTER EM			   */
+  {"mdash",	0x2014},  /* EM DASH					   */
+  {"mgr",	0x03BC},  /* GREEK SMALL LETTER MU			   */
+  {"micro",	0x00B5},  /* MICRO SIGN 				   */
+  {"mid",	0x2223},  /* DIVIDES					   */
+  {"middot",	0x00B7},  /* MIDDLE DOT 				   */
+  {"minus",	0x2212},  /* MINUS SIGN 				   */
+  {"minusb",	0x229F},  /* SQUARED MINUS				   */
+  {"mldr",	0x2026},  /* HORIZONTAL ELLIPSIS			   */
+  {"mnplus",	0x2213},  /* MINUS-OR-PLUS SIGN 			   */
+  {"models",	0x22A7},  /* MODELS					   */
+  {"mu",	0x03BC},  /* GREEK SMALL LETTER MU			   */
+  {"mumap",	0x22B8},  /* MULTIMAP					   */
+  {"nVDash",	0x22AF},  /* NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNS*/
+  {"nVdash",	0x22AE},  /* DOES NOT FORCE				   */
+  {"nabla",	0x2207},  /* NABLA					   */
+  {"nacute",	0x0144},  /* LATIN SMALL LETTER N WITH ACUTE		   */
+  {"nap",	0x2249},  /* NOT ALMOST EQUAL TO			   */
+  {"napos",	0x0149},  /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE   */
+  {"natur",	0x266E},  /* MUSIC NATURAL SIGN 			   */
+  {"nbsp",	0x00A0},  /* NO-BREAK SPACE				   */
+  {"ncaron",	0x0148},  /* LATIN SMALL LETTER N WITH CARON		   */
+  {"ncedil",	0x0146},  /* LATIN SMALL LETTER N WITH CEDILLA		   */
+  {"ncong",	0x2247},  /* NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO   */
+  {"ncy",	0x043D},  /* CYRILLIC SMALL LETTER EN			   */
+  {"ndash",	0x2013},  /* EN DASH					   */
+  {"ne",	0x2260},  /* NOT EQUAL TO				   */
+  {"nearr",	0x2197},  /* NORTH EAST ARROW				   */
+  {"nequiv",	0x2262},  /* NOT IDENTICAL TO				   */
+  {"nexist",	0x2204},  /* THERE DOES NOT EXIST			   */
+  {"nge",	0x2271},  /* NEITHER GREATER-THAN NOR EQUAL TO		   */
+  {"nges",	0x2271},  /* NEITHER GREATER-THAN NOR EQUAL TO		   */
+  {"ngr",	0x03BD},  /* GREEK SMALL LETTER NU			   */
+  {"ngt",	0x226F},  /* NOT GREATER-THAN				   */
+  {"nhArr",	0x21CE},  /* LEFT RIGHT DOUBLE ARROW WITH STROKE	   */
+  {"nharr",	0x21AE},  /* LEFT RIGHT ARROW WITH STROKE		   */
+  {"ni",	0x220B},  /* CONTAINS AS MEMBER 			   */
+  {"njcy",	0x045A},  /* CYRILLIC SMALL LETTER NJE			   */
+  {"nlArr",	0x21CD},  /* LEFTWARDS DOUBLE ARROW WITH STROKE 	   */
+  {"nlarr",	0x219A},  /* LEFTWARDS ARROW WITH STROKE		   */
+  {"nldr",	0x2025},  /* TWO DOT LEADER				   */
+  {"nle",	0x2270},  /* NEITHER LESS-THAN NOR EQUAL TO		   */
+  {"nles",	0x2270},  /* NEITHER LESS-THAN NOR EQUAL TO		   */
+  {"nlt",	0x226E},  /* NOT LESS-THAN				   */
+  {"nltri",	0x22EA},  /* NOT NORMAL SUBGROUP OF			   */
+  {"nltrie",	0x22EC},  /* NOT NORMAL SUBGROUP OF OR EQUAL TO 	   */
+  {"nmid",	0x2224},  /* DOES NOT DIVIDE				   */
+  {"not",	0x00AC},  /* NOT SIGN					   */
+  {"notin",	0x2209},  /* NOT AN ELEMENT OF				   */
+  {"npar",	0x2226},  /* NOT PARALLEL TO				   */
+  {"npr",	0x2280},  /* DOES NOT PRECEDE				   */
+  {"npre",	0x22E0},  /* DOES NOT PRECEDE OR EQUAL			   */
+  {"nrArr",	0x21CF},  /* RIGHTWARDS DOUBLE ARROW WITH STROKE	   */
+  {"nrarr",	0x219B},  /* RIGHTWARDS ARROW WITH STROKE		   */
+  {"nrtri",	0x22EB},  /* DOES NOT CONTAIN AS NORMAL SUBGROUP	   */
+  {"nrtrie",	0x22ED},  /* DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL  */
+  {"nsc",	0x2281},  /* DOES NOT SUCCEED				   */
+  {"nsce",	0x22E1},  /* DOES NOT SUCCEED OR EQUAL			   */
+  {"nsim",	0x2241},  /* NOT TILDE					   */
+  {"nsime",	0x2244},  /* NOT ASYMPTOTICALLY EQUAL TO		   */
+  {"nspar",	0x2226},  /* NOT PARALLEL TO				   */
+  {"nsub",	0x2284},  /* NOT A SUBSET OF				   */
+  {"nsubE",	0x2288},  /* NEITHER A SUBSET OF NOR EQUAL TO		   */
+  {"nsube",	0x2288},  /* NEITHER A SUBSET OF NOR EQUAL TO		   */
+  {"nsup",	0x2285},  /* NOT A SUPERSET OF				   */
+  {"nsupE",	0x2289},  /* NEITHER A SUPERSET OF NOR EQUAL TO 	   */
+  {"nsupe",	0x2289},  /* NEITHER A SUPERSET OF NOR EQUAL TO 	   */
+  {"ntilde",	0x00F1},  /* LATIN SMALL LETTER N WITH TILDE		   */
+  {"nu",	0x03BD},  /* GREEK SMALL LETTER NU			   */
+  {"num",	0x0023},  /* NUMBER SIGN				   */
+  {"numero",	0x2116},  /* NUMERO SIGN				   */
+  {"numsp",	0x2007},  /* FIGURE SPACE				   */
+  {"nvDash",	0x22AD},  /* NOT TRUE					   */
+  {"nvdash",	0x22AC},  /* DOES NOT PROVE				   */
+  {"nwarr",	0x2196},  /* NORTH WEST ARROW				   */
+  {"oS",	0x24C8},  /* CIRCLED LATIN CAPITAL LETTER S		   */
+  {"oacgr",	0x03CC},  /* GREEK SMALL LETTER OMICRON WITH TONOS	   */
+  {"oacute",	0x00F3},  /* LATIN SMALL LETTER O WITH ACUTE		   */
+  {"oast",	0x229B},  /* CIRCLED ASTERISK OPERATOR			   */
+  {"ocir",	0x229A},  /* CIRCLED RING OPERATOR			   */
+  {"ocirc",	0x00F4},  /* LATIN SMALL LETTER O WITH CIRCUMFLEX	   */
+  {"ocy",	0x043E},  /* CYRILLIC SMALL LETTER O			   */
+  {"odash",	0x229D},  /* CIRCLED DASH				   */
+  {"odblac",	0x0151},  /* LATIN SMALL LETTER O WITH DOUBLE ACUTE	   */
+  {"odot",	0x2299},  /* CIRCLED DOT OPERATOR			   */
+  {"oelig",	0x0153},  /* LATIN SMALL LIGATURE OE			   */
+  {"ogon",	0x02DB},  /* OGONEK					   */
+  {"ogr",	0x03BF},  /* GREEK SMALL LETTER OMICRON 		   */
+  {"ograve",	0x00F2},  /* LATIN SMALL LETTER O WITH GRAVE		   */
+  {"ohacgr",	0x03CE},  /* GREEK SMALL LETTER OMEGA WITH TONOS	   */
+  {"ohgr",	0x03C9},  /* GREEK SMALL LETTER OMEGA			   */
+  {"ohm",	0x2126},  /* OHM SIGN					   */
+  {"olarr",	0x21BA},  /* ANTICLOCKWISE OPEN CIRCLE ARROW		   */
+  {"oline",	0x203E},  /* OVERLINE					   */
+  {"omacr",	0x014D},  /* LATIN SMALL LETTER O WITH MACRON		   */
+  {"omega",	0x03C9},  /* GREEK SMALL LETTER OMEGA			   */
+  {"omicron",	0x03BF},  /* GREEK SMALL LETTER OMICRON 		   */
+  {"ominus",	0x2296},  /* CIRCLED MINUS				   */
+  {"oplus",	0x2295},  /* CIRCLED PLUS				   */
+  {"or",	0x2228},  /* LOGICAL OR 				   */
+  {"orarr",	0x21BB},  /* CLOCKWISE OPEN CIRCLE ARROW		   */
+  {"order",	0x2134},  /* SCRIPT SMALL O				   */
+  {"ordf",	0x00AA},  /* FEMININE ORDINAL INDICATOR 		   */
+  {"ordm",	0x00BA},  /* MASCULINE ORDINAL INDICATOR		   */
+  {"oslash",	0x00F8},  /* LATIN SMALL LETTER O WITH STROKE		   */
+  {"osol",	0x2298},  /* CIRCLED DIVISION SLASH			   */
+  {"otilde",	0x00F5},  /* LATIN SMALL LETTER O WITH TILDE		   */
+  {"otimes",	0x2297},  /* CIRCLED TIMES				   */
+  {"ouml",	0x00F6},  /* LATIN SMALL LETTER O WITH DIAERESIS	   */
+  {"par",	0x2225},  /* PARALLEL TO				   */
+  {"para",	0x00B6},  /* PILCROW SIGN				   */
+  {"part",	0x2202},  /* PARTIAL DIFFERENTIAL			   */
+  {"pcy",	0x043F},  /* CYRILLIC SMALL LETTER PE			   */
+  {"percnt",	0x0025},  /* PERCENT SIGN				   */
+  {"period",	0x002E},  /* FULL STOP					   */
+  {"permil",	0x2030},  /* PER MILLE SIGN				   */
+  {"perp",	0x22A5},  /* UP TACK					   */
+  {"pgr",	0x03C0},  /* GREEK SMALL LETTER PI			   */
+  {"phgr",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
+  {"phi",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
+  {"phis",	0x03C6},  /* GREEK SMALL LETTER PHI			   */
+  {"phiv",	0x03D5},  /* GREEK PHI SYMBOL				   */
+  {"phmmat",	0x2133},  /* SCRIPT CAPITAL M				   */
+  {"phone",	0x260E},  /* BLACK TELEPHONE				   */
+  {"pi",	0x03C0},  /* GREEK SMALL LETTER PI			   */
+  {"piv",	0x03D6},  /* GREEK PI SYMBOL				   */
+  {"planck",	0x210F},  /* PLANCK CONSTANT OVER TWO PI		   */
+  {"plus",	0x002B},  /* PLUS SIGN					   */
+  {"plusb",	0x229E},  /* SQUARED PLUS				   */
+  {"plusdo",	0x2214},  /* DOT PLUS					   */
+  {"plusmn",	0x00B1},  /* PLUS-MINUS SIGN				   */
+  {"pound",	0x00A3},  /* POUND SIGN 				   */
+  {"pr",	0x227A},  /* PRECEDES					   */
+  {"pre",	0x227C},  /* PRECEDES OR EQUAL TO			   */
+  {"prime",	0x2032},  /* PRIME					   */
+  {"prnsim",	0x22E8},  /* PRECEDES BUT NOT EQUIVALENT TO		   */
+  {"prod",	0x220F},  /* N-ARY PRODUCT				   */
+  {"prop",	0x221D},  /* PROPORTIONAL TO				   */
+  {"prsim",	0x227E},  /* PRECEDES OR EQUIVALENT TO			   */
+  {"psgr",	0x03C8},  /* GREEK SMALL LETTER PSI			   */
+  {"psi",	0x03C8},  /* GREEK SMALL LETTER PSI			   */
+  {"puncsp",	0x2008},  /* PUNCTUATION SPACE				   */
+  {"quest",	0x003F},  /* QUESTION MARK				   */
+  {"quot",	0x0022},  /* QUOTATION MARK				   */
+  {"rAarr",	0x21DB},  /* RIGHTWARDS TRIPLE ARROW			   */
+  {"rArr",	0x21D2},  /* RIGHTWARDS DOUBLE ARROW			   */
+  {"racute",	0x0155},  /* LATIN SMALL LETTER R WITH ACUTE		   */
+  {"radic",	0x221A},  /* SQUARE ROOT				   */
+  {"rang",	0x232A},  /* RIGHT-POINTING ANGLE BRACKET		   */
+  {"raquo",	0x00BB},  /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK    */
+  {"rarr",	0x2192},  /* RIGHTWARDS ARROW				   */
+  {"rarr2",	0x21C9},  /* RIGHTWARDS PAIRED ARROWS			   */
+  {"rarrhk",	0x21AA},  /* RIGHTWARDS ARROW WITH HOOK 		   */
+  {"rarrlp",	0x21AC},  /* RIGHTWARDS ARROW WITH LOOP 		   */
+  {"rarrtl",	0x21A3},  /* RIGHTWARDS ARROW WITH TAIL 		   */
+  {"rarrw",	0x219D},  /* RIGHTWARDS WAVE ARROW			   */
+  {"rcaron",	0x0159},  /* LATIN SMALL LETTER R WITH CARON		   */
+  {"rcedil",	0x0157},  /* LATIN SMALL LETTER R WITH CEDILLA		   */
+  {"rceil",	0x2309},  /* RIGHT CEILING				   */
+  {"rcub",	0x007D},  /* RIGHT CURLY BRACKET			   */
+  {"rcy",	0x0440},  /* CYRILLIC SMALL LETTER ER			   */
+  {"rdquo",	0x201D},  /* RIGHT DOUBLE QUOTATION MARK		   */
+  {"rdquor",	0x201C},  /* LEFT DOUBLE QUOTATION MARK 		   */
+  {"real",	0x211C},  /* BLACK-LETTER CAPITAL R			   */
+  {"rect",	0x25AD},  /* WHITE RECTANGLE				   */
+  {"reg",	0x00AE},  /* REGISTERED SIGN				   */
+  {"rfloor",	0x230B},  /* RIGHT FLOOR				   */
+  {"rgr",	0x03C1},  /* GREEK SMALL LETTER RHO			   */
+  {"rhard",	0x21C1},  /* RIGHTWARDS HARPOON WITH BARB DOWNWARDS	   */
+  {"rharu",	0x21C0},  /* RIGHTWARDS HARPOON WITH BARB UPWARDS	   */
+  {"rho",	0x03C1},  /* GREEK SMALL LETTER RHO			   */
+  {"rhov",	0x03F1},  /* GREEK RHO SYMBOL				   */
+  {"ring",	0x02DA},  /* RING ABOVE 				   */
+  {"rlarr2",	0x21C4},  /* RIGHTWARDS ARROW OVER LEFTWARDS ARROW	   */
+  {"rlhar2",	0x21CC},  /* RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON	   */
+  {"rlm",	0x200F},  /* RIGHT-TO-LEFT MARK 			   */
+  {"rpar",	0x0029},  /* RIGHT PARENTHESIS				   */
+  {"rsaquo",	0x203A},  /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK    */
+  {"rsh",	0x21B1},  /* UPWARDS ARROW WITH TIP RIGHTWARDS		   */
+  {"rsqb",	0x005D},  /* RIGHT SQUARE BRACKET			   */
+  {"rsquo",	0x2019},  /* RIGHT SINGLE QUOTATION MARK		   */
+  {"rsquor",	0x2018},  /* LEFT SINGLE QUOTATION MARK 		   */
+  {"rthree",	0x22CC},  /* RIGHT SEMIDIRECT PRODUCT			   */
+  {"rtimes",	0x22CA},  /* RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT	   */
+  {"rtri",	0x25B9},  /* WHITE RIGHT-POINTING SMALL TRIANGLE	   */
+  {"rtrie",	0x22B5},  /* CONTAINS AS NORMAL SUBGROUP OR EQUAL TO	   */
+  {"rtrif",	0x25B8},  /* BLACK RIGHT-POINTING SMALL TRIANGLE	   */
+  {"rx",	0x211E},  /* PRESCRIPTION TAKE				   */
+  {"sacute",	0x015B},  /* LATIN SMALL LETTER S WITH ACUTE		   */
+  {"samalg",	0x2210},  /* N-ARY COPRODUCT				   */
+  {"sbquo",	0x201A},  /* SINGLE LOW-9 QUOTATION MARK		   */
+  {"sbsol",	0x005C},  /* REVERSE SOLIDUS				   */
+  {"sc",	0x227B},  /* SUCCEEDS					   */
+  {"scaron",	0x0161},  /* LATIN SMALL LETTER S WITH CARON		   */
+  {"sccue",	0x227D},  /* SUCCEEDS OR EQUAL TO			   */
+  {"sce",	0x227D},  /* SUCCEEDS OR EQUAL TO			   */
+  {"scedil",	0x015F},  /* LATIN SMALL LETTER S WITH CEDILLA		   */
+  {"scirc",	0x015D},  /* LATIN SMALL LETTER S WITH CIRCUMFLEX	   */
+  {"scnsim",	0x22E9},  /* SUCCEEDS BUT NOT EQUIVALENT TO		   */
+  {"scsim",	0x227F},  /* SUCCEEDS OR EQUIVALENT TO			   */
+  {"scy",	0x0441},  /* CYRILLIC SMALL LETTER ES			   */
+  {"sdot",	0x22C5},  /* DOT OPERATOR				   */
+  {"sdotb",	0x22A1},  /* SQUARED DOT OPERATOR			   */
+  {"sect",	0x00A7},  /* SECTION SIGN				   */
+  {"semi",	0x003B},  /* SEMICOLON					   */
+  {"setmn",	0x2216},  /* SET MINUS					   */
+  {"sext",	0x2736},  /* SIX POINTED BLACK STAR			   */
+  {"sfgr",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
+  {"sfrown",	0x2322},  /* FROWN					   */
+  {"sgr",	0x03C3},  /* GREEK SMALL LETTER SIGMA			   */
+  {"sharp",	0x266F},  /* MUSIC SHARP SIGN				   */
+  {"shchcy",	0x0449},  /* CYRILLIC SMALL LETTER SHCHA		   */
+  {"shcy",	0x0448},  /* CYRILLIC SMALL LETTER SHA			   */
+  {"shy",	0x00AD},  /* SOFT HYPHEN				   */
+  {"sigma",	0x03C3},  /* GREEK SMALL LETTER SIGMA			   */
+  {"sigmaf",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
+  {"sigmav",	0x03C2},  /* GREEK SMALL LETTER FINAL SIGMA		   */
+  {"sim",	0x223C},  /* TILDE OPERATOR				   */
+  {"sime",	0x2243},  /* ASYMPTOTICALLY EQUAL TO			   */
+  {"smile",	0x2323},  /* SMILE					   */
+  {"softcy",	0x044C},  /* CYRILLIC SMALL LETTER SOFT SIGN		   */
+  {"sol",	0x002F},  /* SOLIDUS					   */
+  {"spades",	0x2660},  /* BLACK SPADE SUIT				   */
+  {"spar",	0x2225},  /* PARALLEL TO				   */
+  {"sqcap",	0x2293},  /* SQUARE CAP 				   */
+  {"sqcup",	0x2294},  /* SQUARE CUP 				   */
+  {"sqsub",	0x228F},  /* SQUARE IMAGE OF				   */
+  {"sqsube",	0x2291},  /* SQUARE IMAGE OF OR EQUAL TO		   */
+  {"sqsup",	0x2290},  /* SQUARE ORIGINAL OF 			   */
+  {"sqsupe",	0x2292},  /* SQUARE ORIGINAL OF OR EQUAL TO		   */
+  {"squ",	0x25A1},  /* WHITE SQUARE				   */
+  {"square",	0x25A1},  /* WHITE SQUARE				   */
+  {"squf",	0x25AA},  /* BLACK SMALL SQUARE 			   */
+  {"ssetmn",	0x2216},  /* SET MINUS					   */
+  {"ssmile",	0x2323},  /* SMILE					   */
+  {"sstarf",	0x22C6},  /* STAR OPERATOR				   */
+  {"star",	0x2606},  /* WHITE STAR 				   */
+  {"starf",	0x2605},  /* BLACK STAR 				   */
+  {"sub",	0x2282},  /* SUBSET OF					   */
+  {"subE",	0x2286},  /* SUBSET OF OR EQUAL TO			   */
+  {"sube",	0x2286},  /* SUBSET OF OR EQUAL TO			   */
+  {"subnE",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
+  {"subne",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
+  {"sum",	0x2211},  /* N-ARY SUMMATION				   */
+  {"sung",	0x266A},  /* EIGHTH NOTE				   */
+  {"sup",	0x2283},  /* SUPERSET OF				   */
+  {"sup1",	0x00B9},  /* SUPERSCRIPT ONE				   */
+  {"sup2",	0x00B2},  /* SUPERSCRIPT TWO				   */
+  {"sup3",	0x00B3},  /* SUPERSCRIPT THREE				   */
+  {"supE",	0x2287},  /* SUPERSET OF OR EQUAL TO			   */
+  {"supe",	0x2287},  /* SUPERSET OF OR EQUAL TO			   */
+  {"supnE",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
+  {"supne",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
+  {"szlig",	0x00DF},  /* LATIN SMALL LETTER SHARP S 		   */
+  {"target",	0x2316},  /* POSITION INDICATOR 			   */
+  {"tau",	0x03C4},  /* GREEK SMALL LETTER TAU			   */
+  {"tcaron",	0x0165},  /* LATIN SMALL LETTER T WITH CARON		   */
+  {"tcedil",	0x0163},  /* LATIN SMALL LETTER T WITH CEDILLA		   */
+  {"tcy",	0x0442},  /* CYRILLIC SMALL LETTER TE			   */
+  {"tdot",	0x20DB},  /* COMBINING THREE DOTS ABOVE 		   */
+  {"telrec",	0x2315},  /* TELEPHONE RECORDER 			   */
+  {"tgr",	0x03C4},  /* GREEK SMALL LETTER TAU			   */
+  {"there4",	0x2234},  /* THEREFORE					   */
+  {"theta",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
+  {"thetas",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
+  {"thetasym",	0x03D1},  /* GREEK THETA SYMBOL 			   */
+  {"thetav",	0x03D1},  /* GREEK THETA SYMBOL 			   */
+  {"thgr",	0x03B8},  /* GREEK SMALL LETTER THETA			   */
+  {"thinsp",	0x2009},  /* THIN SPACE 				   */
+  {"thkap",	0x2248},  /* ALMOST EQUAL TO				   */
+  {"thksim",	0x223C},  /* TILDE OPERATOR				   */
+  {"thorn",	0x00FE},  /* LATIN SMALL LETTER THORN			   */
+  {"tilde",	0x02DC},  /* SMALL TILDE				   */
+  {"times",	0x00D7},  /* MULTIPLICATION SIGN			   */
+  {"timesb",	0x22A0},  /* SQUARED TIMES				   */
+  {"top",	0x22A4},  /* DOWN TACK					   */
+  {"tprime",	0x2034},  /* TRIPLE PRIME				   */
+  {"trade",	0x2122},  /* TRADE MARK SIGN				   */
+  {"trie",	0x225C},  /* DELTA EQUAL TO				   */
+  {"tscy",	0x0446},  /* CYRILLIC SMALL LETTER TSE			   */
+  {"tshcy",	0x045B},  /* CYRILLIC SMALL LETTER TSHE 		   */
+  {"tstrok",	0x0167},  /* LATIN SMALL LETTER T WITH STROKE		   */
+  {"twixt",	0x226C},  /* BETWEEN					   */
+  {"uArr",	0x21D1},  /* UPWARDS DOUBLE ARROW			   */
+  {"uacgr",	0x03CD},  /* GREEK SMALL LETTER UPSILON WITH TONOS	   */
+  {"uacute",	0x00FA},  /* LATIN SMALL LETTER U WITH ACUTE		   */
+  {"uarr",	0x2191},  /* UPWARDS ARROW				   */
+  {"uarr2",	0x21C8},  /* UPWARDS PAIRED ARROWS			   */
+  {"ubrcy",	0x045E},  /* CYRILLIC SMALL LETTER SHORT U		   */
+  {"ubreve",	0x016D},  /* LATIN SMALL LETTER U WITH BREVE		   */
+  {"ucirc",	0x00FB},  /* LATIN SMALL LETTER U WITH CIRCUMFLEX	   */
+  {"ucy",	0x0443},  /* CYRILLIC SMALL LETTER U			   */
+  {"udblac",	0x0171},  /* LATIN SMALL LETTER U WITH DOUBLE ACUTE	   */
+  {"udiagr",	0x03B0},  /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND */
+  {"udigr",	0x03CB},  /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA	   */
+  {"ugr",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
+  {"ugrave",	0x00F9},  /* LATIN SMALL LETTER U WITH GRAVE		   */
+  {"uharl",	0x21BF},  /* UPWARDS HARPOON WITH BARB LEFTWARDS	   */
+  {"uharr",	0x21BE},  /* UPWARDS HARPOON WITH BARB RIGHTWARDS	   */
+  {"uhblk",	0x2580},  /* UPPER HALF BLOCK				   */
+  {"ulcorn",	0x231C},  /* TOP LEFT CORNER				   */
+  {"ulcrop",	0x230F},  /* TOP LEFT CROP				   */
+  {"umacr",	0x016B},  /* LATIN SMALL LETTER U WITH MACRON		   */
+  {"uml",	0x00A8},  /* DIAERESIS					   */
+  {"uogon",	0x0173},  /* LATIN SMALL LETTER U WITH OGONEK		   */
+  {"uplus",	0x228E},  /* MULTISET UNION				   */
+  {"upsi",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
+  {"upsih",	0x03D2},  /* GREEK UPSILON WITH HOOK SYMBOL		   */
+  {"upsilon",	0x03C5},  /* GREEK SMALL LETTER UPSILON 		   */
+  {"urcorn",	0x231D},  /* TOP RIGHT CORNER				   */
+  {"urcrop",	0x230E},  /* TOP RIGHT CROP				   */
+  {"uring",	0x016F},  /* LATIN SMALL LETTER U WITH RING ABOVE	   */
+  {"utilde",	0x0169},  /* LATIN SMALL LETTER U WITH TILDE		   */
+  {"utri",	0x25B5},  /* WHITE UP-POINTING SMALL TRIANGLE		   */
+  {"utrif",	0x25B4},  /* BLACK UP-POINTING SMALL TRIANGLE		   */
+  {"uuml",	0x00FC},  /* LATIN SMALL LETTER U WITH DIAERESIS	   */
+  {"vArr",	0x21D5},  /* UP DOWN DOUBLE ARROW			   */
+  {"vDash",	0x22A8},  /* TRUE					   */
+  {"varr",	0x2195},  /* UP DOWN ARROW				   */
+  {"vcy",	0x0432},  /* CYRILLIC SMALL LETTER VE			   */
+  {"vdash",	0x22A2},  /* RIGHT TACK 				   */
+  {"veebar",	0x22BB},  /* XOR					   */
+  {"vellip",	0x22EE},  /* VERTICAL ELLIPSIS				   */
+  {"verbar",	0x007C},  /* VERTICAL LINE				   */
+  {"vltri",	0x22B2},  /* NORMAL SUBGROUP OF 			   */
+  {"vprime",	0x2032},  /* PRIME					   */
+  {"vprop",	0x221D},  /* PROPORTIONAL TO				   */
+  {"vrtri",	0x22B3},  /* CONTAINS AS NORMAL SUBGROUP		   */
+  {"vsubnE",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
+  {"vsubne",	0x228A},  /* SUBSET OF WITH NOT EQUAL TO		   */
+  {"vsupnE",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
+  {"vsupne",	0x228B},  /* SUPERSET OF WITH NOT EQUAL TO		   */
+  {"wcirc",	0x0175},  /* LATIN SMALL LETTER W WITH CIRCUMFLEX	   */
+  {"wedgeq",	0x2259},  /* ESTIMATES					   */
+  {"weierp",	0x2118},  /* SCRIPT CAPITAL P				   */
+  {"wreath",	0x2240},  /* WREATH PRODUCT				   */
+  {"xcirc",	0x25CB},  /* WHITE CIRCLE				   */
+  {"xdtri",	0x25BD},  /* WHITE DOWN-POINTING TRIANGLE		   */
+  {"xgr",	0x03BE},  /* GREEK SMALL LETTER XI			   */
+  {"xhArr",	0x2194},  /* LEFT RIGHT ARROW				   */
+  {"xharr",	0x2194},  /* LEFT RIGHT ARROW				   */
+  {"xi",	0x03BE},  /* GREEK SMALL LETTER XI			   */
+  {"xlArr",	0x21D0},  /* LEFTWARDS DOUBLE ARROW			   */
+  {"xrArr",	0x21D2},  /* RIGHTWARDS DOUBLE ARROW			   */
+  {"xutri",	0x25B3},  /* WHITE UP-POINTING TRIANGLE 		   */
+  {"yacute",	0x00FD},  /* LATIN SMALL LETTER Y WITH ACUTE		   */
+  {"yacy",	0x044F},  /* CYRILLIC SMALL LETTER YA			   */
+  {"ycirc",	0x0177},  /* LATIN SMALL LETTER Y WITH CIRCUMFLEX	   */
+  {"ycy",	0x044B},  /* CYRILLIC SMALL LETTER YERU 		   */
+  {"yen",	0x00A5},  /* YEN SIGN					   */
+  {"yicy",	0x0457},  /* CYRILLIC SMALL LETTER YI			   */
+  {"yucy",	0x044E},  /* CYRILLIC SMALL LETTER YU			   */
+  {"yuml",	0x00FF},  /* LATIN SMALL LETTER Y WITH DIAERESIS	   */
+  {"zacute",	0x017A},  /* LATIN SMALL LETTER Z WITH ACUTE		   */
+  {"zcaron",	0x017E},  /* LATIN SMALL LETTER Z WITH CARON		   */
+  {"zcy",	0x0437},  /* CYRILLIC SMALL LETTER ZE			   */
+  {"zdot",	0x017C},  /* LATIN SMALL LETTER Z WITH DOT ABOVE	   */
+  {"zeta",	0x03B6},  /* GREEK SMALL LETTER ZETA			   */
+  {"zgr",	0x03B6},  /* GREEK SMALL LETTER ZETA			   */
+  {"zhcy",	0x0436},  /* CYRILLIC SMALL LETTER ZHE			   */
+  {"zwj",	0x200D},  /* ZERO WIDTH JOINER				   */
+  {"zwnj",	0x200C},  /* ZERO WIDTH NON-JOINER			   */
+/* {"epsiv",	0x????},  variant epsilon			 # ISOgrk3 */
+/* {"fjlig",	0x????},  fj ligature				 # ISOpub  */
+/* {"gEl",	0x????},  greater-than, double equals, less-than # ISOamsr */
+/* {"gap",	0x????},  greater-than, approximately equal to	 # ISOamsr */
+/* {"gnap",	0x????},  greater-than, not approximately equal t# ISOamsn */
+/* {"jnodot",	0x????},  latin small letter dotless j		 # ISOamso */
+/* {"lEg",	0x????},  less-than, double equals, greater-than # ISOamsr */
+/* {"lap",	0x????},  less-than, approximately equal to	 # ISOamsr */
+/* {"lnap",	0x????},  less-than, not approximately equal to  # ISOamsn */
+/* {"lpargt",	0x????},  left parenthesis, greater-than	 # ISOamsc */
+/* {"ngE",	0x????},  not greater-than, double equals	 # ISOamsn */
+/* {"nlE",	0x????},  not less-than, double equals		 # ISOamsn */
+/* {"nsmid",	0x????},  nshortmid				 # ISOamsn */
+/* {"prap",	0x????},  precedes, approximately equal to	 # ISOamsr */
+/* {"prnE",	0x????},  precedes, not double equal		 # ISOamsn */
+/* {"prnap",	0x????},  precedes, not approximately equal to	 # ISOamsn */
+/* {"rpargt",	0x????},  right parenthesis, greater-than	 # ISOamsc */
+/* {"scap",	0x????},  succeeds, approximately equal to	 # ISOamsr */
+/* {"scnE",	0x????},  succeeds, not double equals		 # ISOamsn */
+/* {"scnap",	0x????},  succeeds, not approximately equal to	 # ISOamsn */
+/* {"smid",	0x????},  shortmid				 # ISOamsr */
+};
diff --git a/WWW/Library/apollo_m68k/Makefile b/WWW/Library/apollo_m68k/Makefile
deleted file mode 100644
index 20aa9ac8..00000000
--- a/WWW/Library/apollo_m68k/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#  Make WWW for apollo   NOTE WWW macro changed for unwritable source tree **
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = apollo_m68k
-
-# For ASIS installation, the ASIS code for the machine/os
-ASIS_MACH = apollo-68k/sr-10.3
-
-
-CFLAGS =  -O  -DDEBUG
-LFLAGS =
-CC = cc
-LFLAGS =
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-#WWW = /user/timbl/hypertext/WWW
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-# LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-LIBDIR = /tmp/WWWLibrary_Build
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
-
-
-
diff --git a/WWW/Library/clix/Makefile b/WWW/Library/clix/Makefile
deleted file mode 100644
index e1996d27..00000000
--- a/WWW/Library/clix/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#  Make WWW under unix for a.n.other unix system (bsd)
-#   Use this as a template
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = clix
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = hardware/os
-
-
-CFLAGS =  -O -DDEBUG -DUSG -DUNIX -DCLIX
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# Where is the W3 object library to be installed (not normally done)?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
diff --git a/WWW/Library/convex/Makefile b/WWW/Library/convex/Makefile
deleted file mode 100644
index fcd28786..00000000
--- a/WWW/Library/convex/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#  Make WWW under ConvexOS
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = convex
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = hardware/os
-
-
-CFLAGS =  -O -DDEBUG -Dunix
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# Where is the W3 object library to be installed (not normally done)?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-# HTWAIS = $(LOB)/HTWAIS.o
-# WAIS = YES
-# WAISINC = -I/tmp/freeWAIS-0.202/ir
-# WAISCFLAGS = -DDIRECT_WAIS 
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/decstation/Makefile b/WWW/Library/decstation/Makefile
deleted file mode 100644
index b35d278c..00000000
--- a/WWW/Library/decstation/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#	Platform-specific Makefile for W3 Library	(decstation)
-#	-----------------------------------------
-#
-
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-#CFLAGS = 
-CFLAGS =  -O
-CC = cc
-#LFLAGS = -lresolv
-LFLAGS = 
-
-ASIS_MACH = dec-station/ultrix-4.2
-WWW_MACH = decstation
-
-# Directory for installed binary:
-LIBDIR = /usr/local/lib
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/duns/Makefile b/WWW/Library/duns/Makefile
deleted file mode 100644
index 4852817e..00000000
--- a/WWW/Library/duns/Makefile
+++ /dev/null
@@ -1,489 +0,0 @@
-# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $
-#
-# The cpp used on this machine replaces all newlines and multiple tabs and
-# spaces in a macro expansion with a single space.  Imake tries to compensate
-# for this, but is not always successful.
-#
-
-###########################################################################
-# Makefile generated from "Imake.tmpl" and </tmp/IIf.a00214>
-# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $
-#
-# Platform-specific parameters may be set in the appropriate .cf
-# configuration files.  Site-wide parameters may be set in the file
-# site.def.  Full rebuilds are recommended if any parameters are changed.
-#
-# If your C preprocessor doesn't define any unique symbols, you'll need
-# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing
-# "make Makefile", "make Makefiles", or "make World").
-#
-# If you absolutely can't get imake to work, you'll need to set the
-# variables at the top of each Makefile as well as the dependencies at the
-# bottom (makedepend will do this automatically).
-#
-
-###########################################################################
-# platform-specific configuration parameters - edit sun.cf to change
-
-# platform:  $XConsortium: sun.cf,v 1.38 89/12/23 16:10:10 jim Exp $
-# operating system:  SunOS 4.0.3
-
-###########################################################################
-# site-specific configuration parameters - edit site.def to change
-
-            SHELL = /bin/sh
-
-              TOP = .
-      CURRENT_DIR = .
-
-               AR = ar clq
-  BOOTSTRAPCFLAGS =
-               CC = cc
-
-         COMPRESS = compress
-              CPP = /lib/cpp $(STD_CPP_DEFINES)
-    PREPROCESSCMD = cc -E $(STD_CPP_DEFINES)
-          INSTALL = install
-               LD = ld
-             LINT = lint
-      LINTLIBFLAG = -C
-         LINTOPTS = -axz
-               LN = ln -s
-             MAKE = make
-               MV = mv
-               CP = cp
-           RANLIB = ranlib
-  RANLIBINSTFLAGS =
-               RM = rm -f
-     STD_INCLUDES =
-  STD_CPP_DEFINES =
-      STD_DEFINES =
- EXTRA_LOAD_FLAGS =
-  EXTRA_LIBRARIES =
-             TAGS = ctags
-
-    SHAREDCODEDEF = -DSHAREDCODE
-         SHLIBDEF = -DSUNSHLIB
-
-    PROTO_DEFINES =
-
-     INSTPGMFLAGS =
-
-     INSTBINFLAGS = -m 0755
-     INSTUIDFLAGS = -m 4755
-     INSTLIBFLAGS = -m 0664
-     INSTINCFLAGS = -m 0444
-     INSTMANFLAGS = -m 0444
-     INSTDATFLAGS = -m 0444
-    INSTKMEMFLAGS = -m 4755
-
-          DESTDIR =
-
-     TOP_INCLUDES = -I$(INCROOT)
-
-      CDEBUGFLAGS = -O
-        CCOPTIONS =
-      COMPATFLAGS =
-
-      ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS)
-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
-        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES)
-           LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)
-   LDCOMBINEFLAGS = -X -r
-
-        MACROFILE = sun.cf
-           RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
-
-    IMAKE_DEFINES =
-
-         IRULESRC = $(CONFIGDIR)
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
-
-     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \
-			$(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \
-			$(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES)
-
-###########################################################################
-# X Window System Build Parameters
-# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $
-
-###########################################################################
-# X Window System make variables; this need to be coordinated with rules
-# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $
-
-          PATHSEP = /
-        USRLIBDIR = $(DESTDIR)/usr/lib
-           BINDIR = $(DESTDIR)/usr/bin/X11
-          INCROOT = $(DESTDIR)/usr/include
-     BUILDINCROOT = $(TOP)
-      BUILDINCDIR = $(BUILDINCROOT)/X11
-      BUILDINCTOP = ..
-           INCDIR = $(INCROOT)/X11
-           ADMDIR = $(DESTDIR)/usr/adm
-           LIBDIR = $(USRLIBDIR)/X11
-        CONFIGDIR = $(LIBDIR)/config
-       LINTLIBDIR = $(USRLIBDIR)/lint
-
-          FONTDIR = $(LIBDIR)/fonts
-         XINITDIR = $(LIBDIR)/xinit
-           XDMDIR = $(LIBDIR)/xdm
-           AWMDIR = $(LIBDIR)/awm
-           TWMDIR = $(LIBDIR)/twm
-           GWMDIR = $(LIBDIR)/gwm
-          MANPATH = $(DESTDIR)/usr/man
-    MANSOURCEPATH = $(MANPATH)/man
-           MANDIR = $(MANSOURCEPATH)n
-        LIBMANDIR = $(MANSOURCEPATH)3
-      XAPPLOADDIR = $(LIBDIR)/app-defaults
-
-        SOXLIBREV = 4.2
-          SOXTREV = 4.0
-         SOXAWREV = 4.0
-        SOOLDXREV = 4.0
-         SOXMUREV = 4.0
-        SOXEXTREV = 4.0
-
-       FONTCFLAGS = -t
-
-     INSTAPPFLAGS = $(INSTDATFLAGS)
-
-            IMAKE = imake
-           DEPEND = makedepend
-              RGB = rgb
-            FONTC = bdftosnf
-        MKFONTDIR = mkfontdir
-        MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier.sh
-
-        CONFIGSRC = $(TOP)/config
-        CLIENTSRC = $(TOP)/clients
-          DEMOSRC = $(TOP)/demos
-           LIBSRC = $(TOP)/lib
-          FONTSRC = $(TOP)/fonts
-       INCLUDESRC = $(TOP)/X11
-        SERVERSRC = $(TOP)/server
-          UTILSRC = $(TOP)/util
-        SCRIPTSRC = $(UTILSRC)/scripts
-       EXAMPLESRC = $(TOP)/examples
-       CONTRIBSRC = $(TOP)/../contrib
-           DOCSRC = $(TOP)/doc
-           RGBSRC = $(TOP)/rgb
-        DEPENDSRC = $(UTILSRC)/makedepend
-         IMAKESRC = $(CONFIGSRC)
-         XAUTHSRC = $(LIBSRC)/Xau
-          XLIBSRC = $(LIBSRC)/X
-           XMUSRC = $(LIBSRC)/Xmu
-       TOOLKITSRC = $(LIBSRC)/Xt
-       AWIDGETSRC = $(LIBSRC)/Xaw
-       OLDXLIBSRC = $(LIBSRC)/oldX
-      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-      BDFTOSNFSRC = $(FONTSRC)/bdftosnf
-     MKFONTDIRSRC = $(FONTSRC)/mkfontdir
-     EXTENSIONSRC = $(TOP)/extensions
-
-  DEPEXTENSIONLIB =
-     EXTENSIONLIB = -lXext
-
-          DEPXLIB = $(DEPEXTENSIONLIB)
-             XLIB = $(EXTENSIONLIB) -lX11
-
-      DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
-         XAUTHLIB =  -lXau
-
-        DEPXMULIB =
-           XMULIB = -lXmu
-
-       DEPOLDXLIB =
-          OLDXLIB = -loldX
-
-      DEPXTOOLLIB =
-         XTOOLLIB = -lXt
-
-        DEPXAWLIB =
-           XAWLIB = -lXaw
-
- LINTEXTENSIONLIB = $(USRLIBDIR)/llib-lXext.ln
-         LINTXLIB = $(USRLIBDIR)/llib-lX11.ln
-          LINTXMU = $(USRLIBDIR)/llib-lXmu.ln
-        LINTXTOOL = $(USRLIBDIR)/llib-lXt.ln
-          LINTXAW = $(USRLIBDIR)/llib-lXaw.ln
-
-          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-
-         DEPLIBS1 = $(DEPLIBS)
-         DEPLIBS2 = $(DEPLIBS)
-         DEPLIBS3 = $(DEPLIBS)
-
-###########################################################################
-# Imake rules for building libraries, programs, scripts, and data files
-# rules:  $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $
-
-###########################################################################
-# start of Imakefile
-
-#  Make WWW under unix for a.n.other unix system (bsd)
-#   Use this as a template
-
-TK_WWW_SOURCE_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/Tcl
-
-TK_WWW_INSTALL_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/$(WWW_MACH)
-
-TK_WWW_HOME_PAGE=http://www.w3.org/default.html
-TK_WWW_START_PAGE=$(TK_WWW_HOME_PAGE)
-
-CC = gcc -fno-builtin -Wall
-
-CDEBUGFLAGS = -O3 -pipe
-
-COMPATFLAGS =   -I/afs/athena.mit.edu/course/other/cdsdev/www-compat
-CCOPTIONS =
-
-BINDIR = $(TK_WWW_INSTALL_PATH)
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = unix.x
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = hardware/os
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = /tmp
-
-#	Common Makefile for W3 Library Code
-#	-----------------------------------
-#
-#	(c) CERN 1990, 1991 -- see Copyright.html for conditions
-#
-# This file should be invariant between systems.
-#	DEPENDENCIES NOT COMPLETE
-
-#
-#	make		Compile and link the software (private version)
-#	make clean	Remove intermediate files
-
-WC = $(WWW)/Library
-CMN = $(WWW)/Library/Implementation/
-
-# Where shall we put the objects and built library?
-
-LOB = $(WTMP)/Library/$(WWW_MACH)
-
-# Bug: This path, if relative, is taken relative to the directory
-# in which this makefile is, not the pwd.  This screws up the
-# recursive invocation
-
-VC = 2.14
-
-CFLAGS2 = $(CFLAGS) -I$(CMN)
-
-CERNLIBBIN = $(WWW)/bin
-
-COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \
-	$(LOB)/HTFile.o	$(LOB)/HTFTP.o $(LOB)/HTTCP.o \
-	$(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \
-	$(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \
-	$(LOB)/HTMLGen.o \
-	$(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \
-	$(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \
-	$(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \
-	$(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \
-	$(LOB)/HTTelnet.o  $(LOB)/HTWSRC.o $(HTWAIS)
-
-CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \
-	$(CMN)HTFTP.c   $(CMN)HTTCP.c     $(CMN)SGML.c	\
-	$(CMN)HTMLDTD.c \
-	$(CMN)HTPlain.c	$(CMN)HTWriter.c  $(CMN)HTFWriter.c $(CMN)HTMLGen.c	\
-	$(CMN)HTChunk.c $(CMN)HTAtom.c   $(CMN)HTAnchor.c $(CMN)HTStyle.c \
-	$(CMN)HTList.c  $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \
-	$(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \
-	$(CMN)HTNews.c  $(CMN)HTGopher.c $(CMN)HTTelnet.c \
-	$(CMN)HTWAIS.c  $(CMN)HTWSRC.c
-
-HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \
-	$(CMN)HTFTP.h $(CMN)HTTCP.h \
-	$(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \
-	$(CMN)HTPlain.h		$(CMN)HTWriter.h \
-	$(CMN)HTFWriter.h 	$(CMN)HTMLGen.h	\
-	$(CMN)HTStream.h \
-	$(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \
-	$(CMN)HTList.h \
-	$(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \
-	$(CMN)HTFormat.h $(CMN)HTInit.h \
-	$(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \
-	$(CMN)HTGopher.h \
-	$(CMN)HTUtils.h $(CMN)tcp.h $(CMN)WWW.h $(CMN)HText.h \
-	$(CMN)HTTelnet.h \
-	$(CMN)HTWAIS.h  $(CMN)HTWSRC.h
-
-SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make $(CMN)CommonMakefile \
-	$(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD
-SPECIFIC = $(WWW)/All
-
-#	Library
-#
-#  On SGI, ranlib is unnecessary and does not exist so we ignore errors
-# for that step
-all: $(LOB)/libwww.a
-	$(MV) $(LOB)/libwww.a $(WC)/$(WWW_MACH)
-
-$(LOB)/libwww.a : $(COMMON)
-	ar r $(LOB)/libwww.a $(COMMON)
-	-ranlib $(LOB)/libwww.a
-
-#	Clean up everything generatable except final products
-clean ::
-	$(RM) $(LOB)
-
-#	Clean up everything generatable including final products
-
-cleanall :: clean
-	$(RM) $(LOB)/libwww.a
-
-# 			Common code
-#			-----------
-
-#	Directory for object files - .created checks it exists
-
-OE = $(LOB)/.created
-$(OE) :
-	-mkdir $(WTMP)
-	-mkdir $(WTMP)/Library
-	-mkdir $(WTMP)/Library/$(WWW_MACH)
-	touch $@
-
-$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
-
-$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c
-
-$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c
-
-$(LOB)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.c
-
-$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c
-
-$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c
-
-$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c
-
-$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c
-
-$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c
-
-$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c
-
-$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c
-
-$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c
-
-$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c
-
-$(LOB)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c
-
-$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c
-
-$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c
-
-$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c
-
-$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c
-
-$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c
-
-$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c
-
-$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c
-
-$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c
-
-$(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c
-
-#	Communications & Files
-
-$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c
-
-$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c
-
-$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c
-
-$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c
-
-$(LOB)/HTAccess.o : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c
-
-$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c
-
-###########################################################################
-# common rules for all Makefiles - do not edit
-
-emptyrule::
-
-clean::
-	$(RM_CMD) \#*
-
-Makefile::
-	-@if [ -f Makefile ]; then \
-	echo "	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \
-	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
-	else exit 0; fi
-	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-
-tags::
-	$(TAGS) -w *.[ch]
-	$(TAGS) -xw *.[ch] > TAGS
-
-saber:
-	#load $(ALLDEFINES) $(SRCS)
-
-osaber:
-	#load $(ALLDEFINES) $(OBJS)
-
-###########################################################################
-# empty rules for directories that do not have SUBDIRS - do not edit
-
-install::
-	@echo "install in $(CURRENT_DIR) done"
-
-install.man::
-	@echo "install.man in $(CURRENT_DIR) done"
-
-Makefiles::
-
-includes::
-
-###########################################################################
-# dependencies generated by makedepend
-
diff --git a/WWW/Library/freebsd/Makefile b/WWW/Library/freebsd/Makefile
deleted file mode 100644
index a82f13b8..00000000
--- a/WWW/Library/freebsd/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  Make WWW under FreeBSD
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = freebsd
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = i386/FreeBSD
-
-
-CFLAGS += -DDEBUG
-LFLAGS =
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# Where is the W3 object library to be installed (not normally done)?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/isc/Makefile b/WWW/Library/isc/Makefile
deleted file mode 100644
index 29de6885..00000000
--- a/WWW/Library/isc/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#  Make WWW under unix for a.n.other unix system (bsd)
-#   Use this as a template
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = isc
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = intel/isc
-
-
-CFLAGS =  -DDEBUG -O -DISC -Dvfork=fork
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# Where is the W3 object library to be installed (not normally done)?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
diff --git a/WWW/Library/mips/Makefile b/WWW/Library/mips/Makefile
deleted file mode 100644
index 1c84cbe0..00000000
--- a/WWW/Library/mips/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile for WWW under svr4
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = mips
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = mips/mips
-
-
-#CFLAGS =  -DDEBUG -systype svr3 -DMIPS -DNO_BCOPY
-CFLAGS =  -O -DDEBUG -systype svr3  -I/svr3/usr/include/bsd
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/netbsd/Makefile b/WWW/Library/netbsd/Makefile
deleted file mode 100644
index ae92760a..00000000
--- a/WWW/Library/netbsd/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  Make WWW under NetBSD
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = netbsd
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = i386/NetBSD
-
-
-CFLAGS = -O -DUSE_DIRENT
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# Where is the W3 object library to be installed (not normally done)?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
diff --git a/WWW/Library/next/Makefile b/WWW/Library/next/Makefile
deleted file mode 100644
index bd35c89a..00000000
--- a/WWW/Library/next/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#	Platform-specific Makefile for W3 Library	(NeXT)
-#	-----------------------------------------
-#
-#	Library compiled with fudge to alow XMOSAIC to
-#	pick up binary files... for now.
-
-WWW = ../..
-
-#  Where should temporary (object) files go? Normally, WTMP = $(WWW)
-#WTMP = /tmp
-WTMP = $(WWW)
-
-# For MACH 3.0 it seems -bsd is needed to order to define errno
-# in /usr/include/bsd/sys/errno.h. But __STRICT_BSD__ is needed for
-# errno.
-
-CFLAGS =  -Wall -O -DXMOSAIC_HACK
-
-#	Yes please, I want direct WAIS access
-#
-#WAIS = ../../../freeWAIS
-#WAISINC = -I$(WAIS)/ir
-#WAISCFLAGS = -DDIRECT_WAIS
-#WAISLIB =  $(WAIS)/bin/client.a $(WAIS)/bin/wais.a
-#  $(WAIS)/bin/inv.a $(WAIS)/bin/wais.a
-#HTWAIS = $(WTMP)/Library/$(WWW_MACH)/HTWAIS.o
-
-CC = cc
-#	For testing memory leaks only!   Use /NextDeveloper/MallocDebug app
-LFLAGS = -lMallocDebug
-#LFLAGS =
-
-WWW_MACH = next
-ASIS_MACH = next/2.0
-
-
-# Directory for installed binary:
-LIBDIR = /usr/local/lib
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/osf/Makefile b/WWW/Library/osf/Makefile
deleted file mode 100644
index a81457a6..00000000
--- a/WWW/Library/osf/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#	Platform-specific Makefile for W3 Library	(decstation)
-#	-----------------------------------------
-#
-
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-#CFLAGS = 
-CFLAGS = -DSYS5 
-CC = cc -O
-#LFLAGS =
-LFLAGS = 
-
-ASIS_MACH = alpha/osf1
-WWW_MACH = osf
-
-# Directory for installed binary:
-LIBDIR = /usr/local/lib
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/ptx/Makefile b/WWW/Library/ptx/Makefile
deleted file mode 100644
index 772d6c6a..00000000
--- a/WWW/Library/ptx/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  Make WWW under Sequent's DYNIX/ptx
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = ptx
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = Sequent/ptx
-
-
-CFLAGS =  -O -DDEBUG -DUSE_DIRENT -DSVR4 -DNO_IOCTL -DUSE_FCNTL
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/rs6000/Makefile b/WWW/Library/rs6000/Makefile
deleted file mode 100644
index 334a5a4a..00000000
--- a/WWW/Library/rs6000/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  Make WWW under unix for rs6000 with no gcc
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = rs6000
-
-# For ASIS
-ASIS_MACH = ibm-rs6000/aix-3.2
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# The AIX compiler does not define unix... AIX will do it and avoid realloc bug
-
-CFLAGS = -O -DDEBUG 
-CC = cc
-LFLAGS =
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = $(WWW)
-
-# Where is the W3 object library?
-LIBDIR = /usr/local/lib
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/sco/Makefile b/WWW/Library/sco/Makefile
deleted file mode 100644
index a00a948b..00000000
--- a/WWW/Library/sco/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  Make WWW under unix for a.n.other unix system (bsd)
-#   Use this as a template
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = sco
-
-# The ASIS repository's name for the machine we are on
-#  SCO does not presently have ranlib.  Ignore the error
-#  message about that when the CommonMakefile tries to
-#  invoke it.
-ASIS_MACH = intel/sco
-
-
-CFLAGS =  -O -DDEBUG -DSVR4
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# Where is the W3 object library to be installed (not normally done)?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
diff --git a/WWW/Library/sgi/Makefile b/WWW/Library/sgi/Makefile
deleted file mode 100644
index 24530722..00000000
--- a/WWW/Library/sgi/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#  Make WWW for Silicon Graphics
-#
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = sgi
-
-# Architecutre in ASIS scheme
-#  SGI does not presently have ranlib.  Ignore the error
-#  message about that when the CommonMakefile tries to
-#  invoke it.
-ASIS_MACH = sgi/iris-3.5
-
-CFLAGS = -DDEBUG -O -cckr
-CC = cc
-LFLAGS =
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/snake/Makefile b/WWW/Library/snake/Makefile
deleted file mode 100644
index 06db3012..00000000
--- a/WWW/Library/snake/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  Make WWW under unix for HP 700 or 800 (Snake) using cc
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = snake
-
-# Distribution point for ASIS repository
-ASIS_MACH = hp-700/hpux-8.0
-
-CFLAGS = -O -DDEBUG
-
-#	Link with BSD library for getwd()
-LFLAGS = -lBSD
-
-#CC = cc
-#CC = gcc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/solaris2/Makefile b/WWW/Library/solaris2/Makefile
deleted file mode 100644
index a390cae9..00000000
--- a/WWW/Library/solaris2/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  Make WWW under unix for sun 4
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = solaris2
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = sun-4/sunos-5.2
-
-
-CFLAGS =  -O -DDEBUG -DNGROUPS=16 -Dd_namlen=d_reclen -DNO_BCOPY -DSOLARIS2 -DSVR4 -DUSE_DIRENT
-LFLAGS =
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
diff --git a/WWW/Library/sun3/Makefile b/WWW/Library/sun3/Makefile
deleted file mode 100644
index ee9c6288..00000000
--- a/WWW/Library/sun3/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  Make WWW under unix for sun 3
-#
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = sun3
-
-# For ASIS installation, the ASIS code for the machine/os
-ASIS_MACH = sun-3/sunos-4.1.1
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-CFLAGS = -DDEBUG -O
-LFLAGS =
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/sun4/Makefile b/WWW/Library/sun4/Makefile
deleted file mode 100644
index cf14decb..00000000
--- a/WWW/Library/sun4/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  Make WWW under unix for sun 4
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = sun4
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = sun-4/sunos-4.1.1
-
-
-CFLAGS =  -DDEBUG -O
-LFLAGS =
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
diff --git a/WWW/Library/svr4/Makefile b/WWW/Library/svr4/Makefile
deleted file mode 100644
index a97e6656..00000000
--- a/WWW/Library/svr4/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  Make WWW under svr4
-#
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = svr4
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = generic/svr4
-
-
-CFLAGS =  -O -DDEBUG -DUSE_DIRENT -DSVR4
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile
diff --git a/WWW/Library/umaxv-m88k/Makefile b/WWW/Library/umaxv-m88k/Makefile
deleted file mode 100644
index 79c323c0..00000000
--- a/WWW/Library/umaxv-m88k/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#  Make WWW under unix for a.n.other unix system (bsd)
-#   Use this as a template
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = umaxv-m88k
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = hardware/os
-
-
-CFLAGS =  -O -DDEBUG -D_SYSV3
-LFLAGS =
-CC = cc
-
-# Directory for installed binary:
-BINDIR = /usr/local/bin
-
-# Where is the W3 object library to be installed (not normally done)?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = ../..
-
-
-include $(WWW)/Library/Implementation/CommonMakefile
-
diff --git a/WWW/Library/unix_x/Makefile b/WWW/Library/unix_x/Makefile
deleted file mode 100644
index 23c12453..00000000
--- a/WWW/Library/unix_x/Makefile
+++ /dev/null
@@ -1,491 +0,0 @@
-# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $
-#
-# The cpp used on this machine replaces all newlines and multiple tabs and
-# spaces in a macro expansion with a single space.  Imake tries to compensate
-# for this, but is not always successful.
-#
-
-###########################################################################
-# Makefile generated from "Imake.tmpl" and </tmp/IIf.a02602>
-# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $
-#
-# Platform-specific parameters may be set in the appropriate .cf
-# configuration files.  Site-wide parameters may be set in the file
-# site.def.  Full rebuilds are recommended if any parameters are changed.
-#
-# If your C preprocessor doesn't define any unique symbols, you'll need
-# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing
-# "make Makefile", "make Makefiles", or "make World").
-#
-# If you absolutely can't get imake to work, you'll need to set the
-# variables at the top of each Makefile as well as the dependencies at the
-# bottom (makedepend will do this automatically).
-#
-
-###########################################################################
-# platform-specific configuration parameters - edit sun.cf to change
-
-# platform:  $XConsortium: sun.cf,v 1.38 89/12/23 16:10:10 jim Exp $
-# operating system:  SunOS 4.1.1
-
-###########################################################################
-# site-specific configuration parameters - edit site.def to change
-
-# site:  $XConsortium: site.def,v 1.21 89/12/06 11:46:50 jim Exp $
-
-            SHELL = /bin/sh
-
-              TOP = ../../../.
-      CURRENT_DIR = ./../Library/unix_x
-
-               AR = ar cq
-  BOOTSTRAPCFLAGS =
-               CC = gcc -DNOSTDHDRS -fstrength-reduce -fpcc-struct-return -fwritable-strings -traditional
-
-         COMPRESS = compress
-              CPP = /lib/cpp $(STD_CPP_DEFINES)
-    PREPROCESSCMD = gcc -DNOSTDHDRS -fstrength-reduce -fpcc-struct-return -fwritable-strings -traditional -E $(STD_CPP_DEFINES)
-          INSTALL = install
-               LD = ld
-             LINT = lint
-      LINTLIBFLAG = -C
-         LINTOPTS = -axz
-               LN = ln -s
-             MAKE = make
-               MV = mv
-               CP = cp
-           RANLIB = ranlib
-  RANLIBINSTFLAGS =
-               RM = rm -f
-     STD_INCLUDES =
-  STD_CPP_DEFINES =
-      STD_DEFINES =
- EXTRA_LOAD_FLAGS =
-  EXTRA_LIBRARIES =
-             TAGS = ctags
-
-    SHAREDCODEDEF = -DSHAREDCODE
-         SHLIBDEF = -DSUNSHLIB
-
-    PROTO_DEFINES =
-
-     INSTPGMFLAGS =
-
-     INSTBINFLAGS = -m 0755
-     INSTUIDFLAGS = -m 4755
-     INSTLIBFLAGS = -m 0664
-     INSTINCFLAGS = -m 0444
-     INSTMANFLAGS = -m 0444
-     INSTDATFLAGS = -m 0444
-    INSTKMEMFLAGS = -m 4755
-
-          DESTDIR =
-
-     TOP_INCLUDES = -I$(INCROOT)
-
-      CDEBUGFLAGS = -O
-        CCOPTIONS =
-      COMPATFLAGS =
-
-      ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS)
-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
-        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES)
-           LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)
-   LDCOMBINEFLAGS = -X -r
-
-        MACROFILE = sun.cf
-           RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
-
-    IMAKE_DEFINES =
-
-         IRULESRC = $(CONFIGDIR)
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
-
-     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \
-			$(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \
-			$(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES)
-
-###########################################################################
-# X Window System Build Parameters
-# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $
-
-###########################################################################
-# X Window System make variables; this need to be coordinated with rules
-# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $
-
-          PATHSEP = /
-        USRLIBDIR = $(DESTDIR)/usr/lib
-           BINDIR = $(DESTDIR)/usr/bin/X11
-          INCROOT = $(DESTDIR)/usr/include
-     BUILDINCROOT = $(TOP)
-      BUILDINCDIR = $(BUILDINCROOT)/X11
-      BUILDINCTOP = ..
-           INCDIR = $(INCROOT)/X11
-           ADMDIR = $(DESTDIR)/usr/adm
-           LIBDIR = $(USRLIBDIR)/X11
-        CONFIGDIR = $(LIBDIR)/config
-       LINTLIBDIR = $(USRLIBDIR)/lint
-
-          FONTDIR = $(LIBDIR)/fonts
-         XINITDIR = $(LIBDIR)/xinit
-           XDMDIR = $(LIBDIR)/xdm
-           AWMDIR = $(LIBDIR)/awm
-           TWMDIR = $(LIBDIR)/twm
-           GWMDIR = $(LIBDIR)/gwm
-          MANPATH = $(DESTDIR)/usr/man
-    MANSOURCEPATH = $(MANPATH)/man
-           MANDIR = $(MANSOURCEPATH)n
-        LIBMANDIR = $(MANSOURCEPATH)3
-      XAPPLOADDIR = $(LIBDIR)/app-defaults
-
-        SOXLIBREV = 4.2
-          SOXTREV = 4.0
-         SOXAWREV = 4.0
-        SOOLDXREV = 4.0
-         SOXMUREV = 4.0
-        SOXEXTREV = 4.0
-
-       FONTCFLAGS = -t
-
-     INSTAPPFLAGS = $(INSTDATFLAGS)
-
-            IMAKE = imake
-           DEPEND = makedepend
-              RGB = rgb
-            FONTC = bdftosnf
-        MKFONTDIR = mkfontdir
-        MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier.sh
-
-        CONFIGSRC = $(TOP)/config
-        CLIENTSRC = $(TOP)/clients
-          DEMOSRC = $(TOP)/demos
-           LIBSRC = $(TOP)/lib
-          FONTSRC = $(TOP)/fonts
-       INCLUDESRC = $(TOP)/X11
-        SERVERSRC = $(TOP)/server
-          UTILSRC = $(TOP)/util
-        SCRIPTSRC = $(UTILSRC)/scripts
-       EXAMPLESRC = $(TOP)/examples
-       CONTRIBSRC = $(TOP)/../contrib
-           DOCSRC = $(TOP)/doc
-           RGBSRC = $(TOP)/rgb
-        DEPENDSRC = $(UTILSRC)/makedepend
-         IMAKESRC = $(CONFIGSRC)
-         XAUTHSRC = $(LIBSRC)/Xau
-          XLIBSRC = $(LIBSRC)/X
-           XMUSRC = $(LIBSRC)/Xmu
-       TOOLKITSRC = $(LIBSRC)/Xt
-       AWIDGETSRC = $(LIBSRC)/Xaw
-       OLDXLIBSRC = $(LIBSRC)/oldX
-      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-      BDFTOSNFSRC = $(FONTSRC)/bdftosnf
-     MKFONTDIRSRC = $(FONTSRC)/mkfontdir
-     EXTENSIONSRC = $(TOP)/extensions
-
-  DEPEXTENSIONLIB = $(USRLIBDIR)/libXext.a
-     EXTENSIONLIB =  -lXext
-
-          DEPXLIB = $(DEPEXTENSIONLIB)
-             XLIB = $(EXTENSIONLIB) -lX11
-
-      DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
-         XAUTHLIB =  -lXau
-
-        DEPXMULIB =
-           XMULIB = -lXmu
-
-       DEPOLDXLIB =
-          OLDXLIB = -loldX
-
-      DEPXTOOLLIB =
-         XTOOLLIB = -lXt
-
-        DEPXAWLIB =
-           XAWLIB = -lXaw
-
- LINTEXTENSIONLIB = $(USRLIBDIR)/llib-lXext.ln
-         LINTXLIB = $(USRLIBDIR)/llib-lX11.ln
-          LINTXMU = $(USRLIBDIR)/llib-lXmu.ln
-        LINTXTOOL = $(USRLIBDIR)/llib-lXt.ln
-          LINTXAW = $(USRLIBDIR)/llib-lXaw.ln
-
-          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-
-         DEPLIBS1 = $(DEPLIBS)
-         DEPLIBS2 = $(DEPLIBS)
-         DEPLIBS3 = $(DEPLIBS)
-
-###########################################################################
-# Imake rules for building libraries, programs, scripts, and data files
-# rules:  $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $
-
-###########################################################################
-# start of Imakefile
-
-#  Make WWW under unix for a.n.other unix system (bsd)
-#   Use this as a template
-
-TK_WWW_SOURCE_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/Tcl
-
-TK_WWW_INSTALL_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/$WWW_MACH
-
-TK_WWW_HOME_PAGE=http://www.w3.org/default.html
-TK_WWW_START_PAGE=$(TK_WWW_HOME_PAGE)
-
-CC = gcc -fno-builtin -Wall
-
-CDEBUGFLAGS = -O3 -pipe
-
-COMPATFLAGS =   -I/afs/athena.mit.edu/course/other/cdsdev/www-compat
-CCOPTIONS =
-
-BINDIR = $(TK_WWW_INSTALL_PATH)
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = unix_x
-
-# The ASIS repository's name for the machine we are on
-ASIS_MACH = hardware/os
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = /tmp
-
-#	Common Makefile for W3 Library Code
-#	-----------------------------------
-#
-#	(c) CERN 1990, 1991 -- see Copyright.html for conditions
-#
-# This file should be invariant between systems.
-#	DEPENDENCIES NOT COMPLETE
-
-#
-#	make		Compile and link the software (private version)
-#	make clean	Remove intermediate files
-
-WC = $(WWW)/Library
-CMN = $(WWW)/Library/Implementation/
-
-# Where shall we put the objects and built library?
-
-LOB = $(WTMP)/Library/$(WWW_MACH)
-
-# Bug: This path, if relative, is taken relative to the directory
-# in which this makefile is, not the pwd.  This screws up the
-# recursive invocation
-
-VC = 2.14
-
-CFLAGS2 = $(CFLAGS) -I$(CMN)
-
-CERNLIBBIN = $(WWW)/bin
-
-COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \
-	$(LOB)/HTBTree.o \
-	$(LOB)/HTFile.o	$(LOB)/HTFTP.o $(LOB)/HTTCP.o \
-	$(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \
-	$(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \
-	$(LOB)/HTMLGen.o \
-	$(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \
-	$(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \
-	$(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \
-	$(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \
-	$(LOB)/HTTelnet.o  $(LOB)/HTWSRC.o $(HTWAIS)
-
-CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTBTree.c \
-	$(CMN)HTFile.c \
-	$(CMN)HTFTP.c   $(CMN)HTTCP.c     $(CMN)SGML.c	\
-	$(CMN)HTMLDTD.c \
-	$(CMN)HTPlain.c	$(CMN)HTWriter.c  $(CMN)HTFWriter.c $(CMN)HTMLGen.c	\
-	$(CMN)HTChunk.c $(CMN)HTAtom.c   $(CMN)HTAnchor.c $(CMN)HTStyle.c \
-	$(CMN)HTList.c  $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \
-	$(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \
-	$(CMN)HTNews.c  $(CMN)HTGopher.c $(CMN)HTTelnet.c \
-	$(CMN)HTWAIS.c  $(CMN)HTWSRC.c
-
-HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTBTree.h \
-	$(CMN)HTFile.h \
-	$(CMN)HTFTP.h $(CMN)HTTCP.h \
-	$(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \
-	$(CMN)HTPlain.h		$(CMN)HTWriter.h \
-	$(CMN)HTFWriter.h 	$(CMN)HTMLGen.h	\
-	$(CMN)HTStream.h \
-	$(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \
-	$(CMN)HTList.h \
-	$(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \
-	$(CMN)HTFormat.h $(CMN)HTInit.h \
-	$(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \
-	$(CMN)HTGopher.h \
-	$(CMN)HTUtils.h $(CMN)tcp.h $(CMN)WWW.h $(CMN)HText.h \
-	$(CMN)HTTelnet.h \
-	$(CMN)HTWAIS.h  $(CMN)HTWSRC.h
-
-SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make $(CMN)CommonMakefile \
-	$(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD
-SPECIFIC = $(WWW)/All
-
-#	Library
-#
-#  On SGI, ranlib is unnecessary and does not exist so we ignore errors
-# for that step
-all: $(LOB)/libwww.a
-	$(MV) $(LOB)/libwww.a $(WC)/$(WWW_MACH)
-
-$(LOB)/libwww.a : $(COMMON)
-	ar r $(LOB)/libwww.a $(COMMON)
-	-ranlib $(LOB)/libwww.a
-
-#	Clean up everything generatable except final products
-clean ::
-	$(RM) $(LOB)
-
-#	Clean up everything generatable including final products
-
-cleanall :: clean
-	$(RM) $(LOB)/libwww.a
-
-# 			Common code
-#			-----------
-
-#	Directory for object files - .created checks it exists
-
-OE = $(LOB)/.created
-$(OE) :
-	-mkdir $(WTMP)
-	-mkdir $(WTMP)/Library
-	-mkdir $(WTMP)/Library/$(WWW_MACH)
-	touch $@
-
-$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
-
-$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c
-
-$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c
-
-$(LOB)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.c
-
-$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c
-
-$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c
-
-$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c
-
-$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c
-
-$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c
-
-$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c
-
-$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c
-
-$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c
-
-$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c
-
-$(LOB)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c
-
-$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c
-
-$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c
-
-$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c
-
-$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c
-
-$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c
-
-$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c
-
-$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c
-
-$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c
-
-$(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c
-
-#	Communications & Files
-
-$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c
-
-$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c
-
-$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c
-
-$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c
-
-$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c
-
-$(LOB)/HTAccess.o : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c
-
-$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c
-
-###########################################################################
-# common rules for all Makefiles - do not edit
-
-emptyrule::
-
-clean::
-	$(RM_CMD) \#*
-
-Makefile::
-	-@if [ -f Makefile ]; then \
-	echo "	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \
-	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
-	else exit 0; fi
-	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-
-tags::
-	$(TAGS) -w *.[ch]
-	$(TAGS) -xw *.[ch] > TAGS
-
-###########################################################################
-# empty rules for directories that do not have SUBDIRS - do not edit
-
-install::
-	@echo "install in $(CURRENT_DIR) done"
-
-install.man::
-	@echo "install.man in $(CURRENT_DIR) done"
-
-Makefiles::
-
-includes::
-
-###########################################################################
-# dependencies generated by makedepend
-
diff --git a/WWW/Library/vax_ultrix/Makefile b/WWW/Library/vax_ultrix/Makefile
deleted file mode 100644
index 2caf766c..00000000
--- a/WWW/Library/vax_ultrix/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  Make WWW under ultrix with gcc
-#
-
-
-# For W3 distribution, machine type for subdirectories
-WWW_MACH = vax_ultrix
-
-# For ASIS installation, the ASIS code for the machine/os
-ASIS_MACH = none
-
-CC = gcc
-CFLAGS = -O  -DDEBUG -Wall
-LFLAGS = -O
-
-#	This is bug fix for out-of-date ultrix on cernvax
-# LFLAGS = -O pfcode.o -lresolv
-
-# Directory for installed binary:
-BINDIR = /usr/local/unix
-
-
-#_________________ OK if normal W3 distribution
-# Where is the WWW source root?
-WWW = ../..
-
-#  Where should temporary (object) files go?
-WTMP = /tmp
-
-
-# Where is the W3 object library?
-LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-
-include $(WWW)/Library/Implementation/CommonMakefile