about summary refs log tree commit diff stats
path: root/src/chrtrans
diff options
context:
space:
mode:
Diffstat (limited to 'src/chrtrans')
-rw-r--r--src/chrtrans/Makefile.old2
-rw-r--r--src/chrtrans/README.tables8
-rw-r--r--src/chrtrans/cp866_uni.tbl39
-rw-r--r--src/chrtrans/def7_uni.tbl95
-rw-r--r--src/chrtrans/iso01_uni.tbl296
-rw-r--r--src/chrtrans/iso02_uni.tbl379
-rw-r--r--src/chrtrans/iso03_uni.tbl359
-rw-r--r--src/chrtrans/iso04_uni.tbl372
-rw-r--r--src/chrtrans/iso05_uni.tbl370
-rw-r--r--src/chrtrans/iso06_uni.tbl288
-rw-r--r--src/chrtrans/iso07_uni.tbl358
-rw-r--r--src/chrtrans/iso08_uni.tbl284
-rw-r--r--src/chrtrans/iso09_uni.tbl288
-rw-r--r--src/chrtrans/makefile.dos2
14 files changed, 2039 insertions, 1101 deletions
diff --git a/src/chrtrans/Makefile.old b/src/chrtrans/Makefile.old
index c4b04b2f..0ca53fc2 100644
--- a/src/chrtrans/Makefile.old
+++ b/src/chrtrans/Makefile.old
@@ -18,7 +18,7 @@ FONTMAP_INC = iso01_uni.h# default, if not set by recursive call
 
 ### fastdep: $(FONTMAP_INC)
 
-### MCFLAGS=-g -DUNIX -DLINUX -DNO_KEYPAD -DNO_TTYTYPE -DEXP_CHARTRANS -I.. -I../../WWW/Library/Implementation -I../..
+### MCFLAGS=-g -DUNIX -DLINUX -DNO_KEYPAD -DNO_TTYTYPE -I.. -I../../WWW/Library/Implementation -I../..
 
 TABLES= \
  cp1250_uni.h \
diff --git a/src/chrtrans/README.tables b/src/chrtrans/README.tables
index 3c502c74..7f095f2f 100644
--- a/src/chrtrans/README.tables
+++ b/src/chrtrans/README.tables
@@ -1,12 +1,12 @@
 The translation table files in this directory are _examples only_.
 They were collected from several sources (among them Linux kbd package, 
-ftp://dkuug.dk/, ftp://unicode.org/) and automatically comverted (if
+ftp://dkuug.dk/, ftp://unicode.org/) and automatically converted (if
 applicable), but not checked in detail.  The Unicode/UCS2 values
 for some of the RFC 1345 Mnemonic codes are out of date, a cleanup and
 update would be needed for serious use (including removing the mappings
 from the "private zone" U+E000 etc.).
 
-More tranlation files can be easily provided (and new character entities
+More translation files can be easily provided (and new character entities
 added to HTMLDTD.c), this set is just to test whether the system works 
 in principle (and also how it behaves with incomplete data...)
 
@@ -20,7 +20,7 @@ included by UCdomap.c.
 
 Ideally, this should be taken care of by the Makefiles.  On VMS, use
 build-chrtrans.com to compile and link makeuctb.exe and create the
-set of .h files from the current set of .tlb files.  Thereafter, use
+set of .h files from the current set of .tbl files.  Thereafter, use
 build-header.com to update particular .h files.
 
 To make a new chartrans table available to Lynx (and thereby make a new
@@ -40,7 +40,7 @@ b) At the bottom, you will find a bunch of lines (again, some may be
     UC_CHARSET_SETUP_<something>;
 
 which should correspond to the #include lines from a).  Again,
-add or substract as you wish (but preferably consistent with what you
+add or subtract as you wish (but preferably consistent with what you
 did under a)...) [The <something> is derived from the charset's MIME name.
 if in doubt, check the last lines of the corresponding ...uni.h file.]
 
diff --git a/src/chrtrans/cp866_uni.tbl b/src/chrtrans/cp866_uni.tbl
index 9de12f9d..2d02ce1b 100644
--- a/src/chrtrans/cp866_uni.tbl
+++ b/src/chrtrans/cp866_uni.tbl
@@ -21,37 +21,8 @@ ODosCyrillic (cp866)
 #
 #    The entries are in cp866_DOSCyrillicRussian order
 #
-0x20-0x40       idem
-
-# Some mapppings of Greek capital letters to Latin letters added. - KW
-0x41	U+0041	U+0391	#LATIN CAPITAL LETTER A
-0x42	U+0042	U+0392	#LATIN CAPITAL LETTER B
-0x43	U+0043	#LATIN CAPITAL LETTER C
-0x44	U+0044	#LATIN CAPITAL LETTER D
-0x45	U+0045	U+0395	#LATIN CAPITAL LETTER E
-0x46	U+0046	#LATIN CAPITAL LETTER F
-0x47	U+0047	#LATIN CAPITAL LETTER G
-0x48	U+0048	U+0397	#LATIN CAPITAL LETTER H
-0x49	U+0049	U+0399	#LATIN CAPITAL LETTER I
-0x4a	U+004a	#LATIN CAPITAL LETTER J
-0x4b	U+004b	U+039a	#LATIN CAPITAL LETTER K
-0x4c	U+004c	#LATIN CAPITAL LETTER L
-0x4d	U+004d	U+039c	#LATIN CAPITAL LETTER M
-0x4e	U+004e	U+039d	#LATIN CAPITAL LETTER N
-0x4f	U+004f	U+039f	#LATIN CAPITAL LETTER O
-0x50	U+0050	U+03a1	#LATIN CAPITAL LETTER P
-0x51	U+0051	#LATIN CAPITAL LETTER Q
-0x52	U+0052	#LATIN CAPITAL LETTER R
-0x53	U+0053	#LATIN CAPITAL LETTER S
-0x54	U+0054	U+03a4	#LATIN CAPITAL LETTER T
-0x55	U+0055	#LATIN CAPITAL LETTER U
-0x56	U+0056	#LATIN CAPITAL LETTER V
-0x57	U+0057	#LATIN CAPITAL LETTER W
-0x58	U+0058	U+03a7	#LATIN CAPITAL LETTER X
-0x59	U+0059	U+03a5	#LATIN CAPITAL LETTER Y
-0x5a	U+005a	U+0396	#LATIN CAPITAL LETTER Z
-0x5b-0x7f       idem
-
+0x20-0x7f       idem
+#
 0x80    U+0410  #CYRILLIC CAPITAL LETTER A
 0x81    U+0411  #CYRILLIC CAPITAL LETTER BE
 0x82    U+0412  #CYRILLIC CAPITAL LETTER VE
@@ -181,9 +152,3 @@ ODosCyrillic (cp866)
 0xfe    U+25a0  #BLACK SQUARE
 0xff    U+00a0  #NO-BREAK SPACE
 
-# TRADE MARK SIGN:
-U+2122:(TM)
-
-0x60    U+2018          # left single quotation mark <`>
-0x27    U+2019-U+201b   # various single quotation marks <'>
-0x22    U+201c-U+201f   # various double quotation marks <">
diff --git a/src/chrtrans/def7_uni.tbl b/src/chrtrans/def7_uni.tbl
index 07d9b0f6..267fa751 100644
--- a/src/chrtrans/def7_uni.tbl
+++ b/src/chrtrans/def7_uni.tbl
@@ -9,10 +9,14 @@ Mus-ascii
 # There has to be exactly one table marked as "default".
 D1
 
-0x20-0x2f	idem
-0x3a	idem
-0x3f-0x7e	idem
 
+# this letters should not normally pass here,
+# but may come from named and numbered entities:
+0x20-0x7e  idem
+
+
+# NO-BREAK SPACE,
+# should not happen (processed in the code):
 #U+00a0:NS
 U+00a1:!
 U+00a2:-c-
@@ -22,11 +26,15 @@ U+00a5:YEN
 U+00a6:|
 U+00a7:S:
 U+00a8:"
+# COPYRIGHT SIGN:
 U+00a9:(c)
 U+00aa:-a
 U+00ab:<<
 U+00ac:NOT
-U+00ad:-
+# SOFT HYPHEN,
+# should not happen (processed in the code):
+#U+00ad:-
+# REGISTERED SIGN:
 U+00ae:(R)
 U+00af:-
 U+00b0:DEG
@@ -57,7 +65,7 @@ U+00d0:D-
 0x4e	U+00d1
 0x4f	U+00d2-U+00d5
 U+00d6:O:
-U+00d7: * 
+U+00d7: *
 U+00d8:O/
 0x55	U+00d9-U+00db
 U+00dc:U:
@@ -87,6 +95,8 @@ U+00fe:th
 0x41	U+0100	U+0102	U+0104
 0x61	U+0101	U+0103	U+0105
 0x43	U+0106	U+0108	U+010a	U+010c
+# The following line is an example for mapping several accented versions
+# of small letter 'c' to 'c':
 0x63	U+0107	U+0109	U+010b	U+010d
 0x44	U+010e
 0x64	U+010f
@@ -121,7 +131,7 @@ U+0149:'n
 U+014a:NG
 0x4e	U+014B #	LATIN SMALL LETTER ENG	-> N
 0x4f	U+014c	U+014e
-0x6f	U+014e	U+014f
+0x6f	U+014d	U+014f
 U+0150:O"
 U+0151:o"
 U+0152:OE
@@ -406,7 +416,8 @@ U+03cd:u%
 U+03ce:w%
 U+03d0:b3
 U+03d1:theta 
-U+03d2:\upsih
+U+03d2:upsi
+U+03d5:phi
 U+03d6:pi 
 U+03da:T3
 U+03db:t3
@@ -416,6 +427,8 @@ U+03de:K3
 U+03df:k3
 U+03e0:P3
 U+03e1:p3
+U+03f0:kappa
+U+03f1:rho 
 U+03f4:'%
 U+03f5:j3
 # Cyrillic capital letters
@@ -1272,9 +1285,9 @@ U+200a:
 0x2d	U+2010	U+2013-U+2015	# hyphen-like
 U+2016:||
 U+2017:=2
-0x60	U+2018		# left single quotation mark
-0x27	U+2019-U+201b	# various single quotation marks 
-0x22	U+201c-U+201f	# various double quotation marks
+0x60	U+2018		# left single quotation mark  <`>
+0x27	U+2019-U+201b	# various single quotation marks <'>
+0x22	U+201c-U+201f	# various double quotation marks <">
 U+2020:/-
 U+2021:/=
 U+2022: o 
@@ -1348,12 +1361,16 @@ U+2118:P
 U+211C:Re
 U+211e:Rx
 U+2120:(SM)
+# TRADE MARK SIGN:
 U+2122:(TM)
 U+2126:Ohm
 0x4b	U+212A	# Kelvin sign - K
 U+212b:Ang.
 U+212E:est.
 U+2135:Aleph 
+U+2136:Bet 
+U+2137:Gimel 
+U+2138:Dalet 
 U+2153: 1/3
 U+2154: 2/3
 U+2155: 1/5
@@ -1438,7 +1455,7 @@ U+2218:Ob
 U+2219:sb
 U+221a: SQRT 
 U+221d:0(
-U+221e:00
+U+221e:infty
 U+221f:-L
 U+2220:-V
 U+2225:PP
@@ -2114,6 +2131,7 @@ U+fef9:lh-
 U+fefa:lh.
 U+fefb:la-
 U+fefc:la.
+
 # Symbols for C0 and C1 control characters, in case they get through...
 U+0000:NUL
 U+0001:SH
@@ -2149,7 +2167,10 @@ U+001e:RS
 U+001f:US
 U+007f:DT
 U+0080:PA
-#U+0081:HO
+U+0081:HO
+# most of that characters (82-9F) processed in the code
+# as windows-1250,1252 if passed silently (HTTP default is iso-latin-1),
+# so should not happen:
 #U+0082:BH
 #U+0083:NH
 #U+0084:IN
@@ -2174,48 +2195,16 @@ U+0090:DCS
 #U+0097:EG
 #U+0098:SS
 #U+0099:GC
-#U+009a:SC
-U+009b:CSI
+U+009a:SC
+#U+009b:CSI
 #U+009c:ST
 #U+009d:OC
 #U+009e:PM
 #U+009f:AC
-# Unassigned stuff in private zone (?)
-#U+e000:"3
-#U+e001:"1
-#U+e002:"!
-#U+e003:"'
-#U+e004:">
-#U+e005:"?
-#U+e006:"-
-#U+e007:"(
-#U+e008:".
-#U+e009:":
-#U+e00a:"0
-#U+e00b:",
-#U+e00c:"_
-#U+e00d:""
-#U+e00e:";
-#U+e00f:"<
-#U+e010:"=
-#U+e011:"/
-#U+e012:"p
-#U+e013:"d
-#U+e014:"i
-#U+e015:+_
-#U+e016:a+:
-#U+e017:Tel
-#U+e018:UA
-#U+e019:UB
-#U+e01e:Mc
-#U+e01f:Fl
-#
-#U+e020:pm
-#U+e021:Tel
-#U+e022:a+:
-#U+e023:Fl
-#U+e024:GF
-#U+e025:>V
-#U+e026:!*
-#U+e027:?*
-#U+e028:J<
+
+# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers.
+
+# Let's try to show a question mark for character that cannot
+# be shown.  U+fffd is used for invalid characters.
+# It works, but let's stick with UHHH representatiion. - FM
+#U+fffd:?
diff --git a/src/chrtrans/iso01_uni.tbl b/src/chrtrans/iso01_uni.tbl
index d2701f0e..f792164d 100644
--- a/src/chrtrans/iso01_uni.tbl
+++ b/src/chrtrans/iso01_uni.tbl
@@ -1,7 +1,3 @@
-#
-# Unicode mapping table for ISO 8859-1 fonts iso01.*
-# [use: unicode_start iso01.f16 iso01]
-#
 #Shall this become the "default" translation?
 #Meaning of that is currently not well defined.  It is different
 #from the default input or default output charset...
@@ -14,65 +10,241 @@ Miso-8859-1
 #Name as a Display Charset (used on Options screen)
 OISO Latin 1
 
-0x20	U+0020  U+1360 
-0x21-0x62	idem
-# The following line is an example for mapping several accented versions
-# of small letter 'c' to 'c':
-0x63	U+0063 U+0107 U+0109 U+010B U+010D
-0x64-0x7e	idem
-0xa0-0xff	idem
-#0x00	U+fffd   # don't let failed char lookups return 0
-# Mappings of C0 control chars from original, disabled
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
-#0x7f		U+2302
-
-0xd0	U+0110	# Dstrok and ETH are nearly the same...
-
-# Dont wanna see these:
-# POP DIRECTIONAL FORMATTING      202C
-U+202c:
-# LEFT-TO-RIGHT OVERRIDE  202D
-U+202d:
+#
+#	Name:             ISO 8859-1 (1987) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-1 (1987) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-1 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-1 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
+0xa0-0xff idem  #  iso 8859-1 special: trivial mapping to Unicode
+#
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+#0xA0	U+00A0	#	NO-BREAK SPACE
+#0xA1	U+00A1	#	INVERTED EXCLAMATION MARK
+#0xA2	U+00A2	#	CENT SIGN
+#0xA3	U+00A3	#	POUND SIGN
+#0xA4	U+00A4	#	CURRENCY SIGN
+#0xA5	U+00A5	#	YEN SIGN
+#0xA6	U+00A6	#	BROKEN BAR
+#0xA7	U+00A7	#	SECTION SIGN
+#0xA8	U+00A8	#	DIAERESIS
+#0xA9	U+00A9	#	COPYRIGHT SIGN
+#0xAA	U+00AA	#	FEMININE ORDINAL INDICATOR
+#0xAB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+#0xAC	U+00AC	#	NOT SIGN
+#0xAD	U+00AD	#	SOFT HYPHEN
+#0xAE	U+00AE	#	REGISTERED SIGN
+#0xAF	U+00AF	#	MACRON
+#0xB0	U+00B0	#	DEGREE SIGN
+#0xB1	U+00B1	#	PLUS-MINUS SIGN
+#0xB2	U+00B2	#	SUPERSCRIPT TWO
+#0xB3	U+00B3	#	SUPERSCRIPT THREE
+#0xB4	U+00B4	#	ACUTE ACCENT
+#0xB5	U+00B5	#	MICRO SIGN
+#0xB6	U+00B6	#	PILCROW SIGN
+#0xB7	U+00B7	#	MIDDLE DOT
+#0xB8	U+00B8	#	CEDILLA
+#0xB9	U+00B9	#	SUPERSCRIPT ONE
+#0xBA	U+00BA	#	MASCULINE ORDINAL INDICATOR
+#0xBB	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+#0xBC	U+00BC	#	VULGAR FRACTION ONE QUARTER
+#0xBD	U+00BD	#	VULGAR FRACTION ONE HALF
+#0xBE	U+00BE	#	VULGAR FRACTION THREE QUARTERS
+#0xBF	U+00BF	#	INVERTED QUESTION MARK
+#0xC0	U+00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+#0xC1	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+#0xC2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+#0xC3	U+00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+#0xC4	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+#0xC5	U+00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+#0xC6	U+00C6	#	LATIN CAPITAL LETTER AE
+#0xC7	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+#0xC8	U+00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+#0xC9	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+#0xCA	U+00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+#0xCB	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+#0xCC	U+00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+#0xCD	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+#0xCE	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+#0xCF	U+00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+#0xD0	U+00D0	#	LATIN CAPITAL LETTER ETH (Icelandic)
+#0xD1	U+00D1	#	LATIN CAPITAL LETTER N WITH TILDE
+#0xD2	U+00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+#0xD3	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+#0xD4	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+#0xD5	U+00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+#0xD6	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+#0xD7	U+00D7	#	MULTIPLICATION SIGN
+#0xD8	U+00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+#0xD9	U+00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+#0xDA	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+#0xDB	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+#0xDC	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+#0xDD	U+00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
+#0xDE	U+00DE	#	LATIN CAPITAL LETTER THORN (Icelandic)
+#0xDF	U+00DF	#	LATIN SMALL LETTER SHARP S (German)
+#0xE0	U+00E0	#	LATIN SMALL LETTER A WITH GRAVE
+#0xE1	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
+#0xE2	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+#0xE3	U+00E3	#	LATIN SMALL LETTER A WITH TILDE
+#0xE4	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+#0xE5	U+00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+#0xE6	U+00E6	#	LATIN SMALL LETTER AE
+#0xE7	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+#0xE8	U+00E8	#	LATIN SMALL LETTER E WITH GRAVE
+#0xE9	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
+#0xEA	U+00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+#0xEB	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+#0xEC	U+00EC	#	LATIN SMALL LETTER I WITH GRAVE
+#0xED	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
+#0xEE	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+#0xEF	U+00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+#0xF0	U+00F0	#	LATIN SMALL LETTER ETH (Icelandic)
+#0xF1	U+00F1	#	LATIN SMALL LETTER N WITH TILDE
+#0xF2	U+00F2	#	LATIN SMALL LETTER O WITH GRAVE
+#0xF3	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
+#0xF4	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+#0xF5	U+00F5	#	LATIN SMALL LETTER O WITH TILDE
+#0xF6	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+#0xF7	U+00F7	#	DIVISION SIGN
+#0xF8	U+00F8	#	LATIN SMALL LETTER O WITH STROKE
+#0xF9	U+00F9	#	LATIN SMALL LETTER U WITH GRAVE
+#0xFA	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
+#0xFB	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+#0xFC	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+#0xFD	U+00FD	#	LATIN SMALL LETTER Y WITH ACUTE
+#0xFE	U+00FE	#	LATIN SMALL LETTER THORN (Icelandic)
+#0xFF	U+00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
 
-# TRADE MARK SIGN:
-U+2122:(TM)
 
-0x60    U+2018          # left single quotation mark
-0x27    U+2019-U+201b   # various single quotation marks
-0x22    U+201c-U+201f   # various double quotation marks
+0xd0	U+0110	# Dstrok and ETH are nearly the same...
 
 U+2297 "(\327)"
diff --git a/src/chrtrans/iso02_uni.tbl b/src/chrtrans/iso02_uni.tbl
index ac7dd37a..af97bc55 100644
--- a/src/chrtrans/iso02_uni.tbl
+++ b/src/chrtrans/iso02_uni.tbl
@@ -1,155 +1,242 @@
-#
-# Unicode mapping table for ISO 8859-2 fonts iso02.*
-# [use: unicode_start iso02.f16 iso02]
-#
-0x20-0x7e	idem
-
-#The MIME name of this charset. 
+#The MIME name of this charset.
 Miso-8859-2
 
 #Name as a Display Charset (used on Options screen)
 OISO Latin 2
- 
+
+#
+#	Name:             ISO 8859-2 (1987) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-2 (1987) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-2 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-2 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
 #
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
-#0x7f		U+2302
+0x20-0x7e idem
 #
-0xa0	U+00a0
-0xa1	U+0104
-0xa2	U+02d8
-0xa3	U+0141
-0xa4	U+00a4
-0xa5	U+013d
-0xa6	U+015a
-0xa7	U+00a7
-0xa8	U+00a8
-0xa9	U+0160
-0xaa	U+015e
-0xab	U+0164
-0xac	U+0179
-0xad	U+00ad
-0xae	U+017d
-0xaf	U+017b
-0xb0	U+00b0
-0xb1	U+0105
-0xb2	U+02db
-0xb3	U+0142
-0xb4	U+00b4
-0xb5	U+013e
-0xb6	U+015b
-0xb7	U+02c7
-0xb8	U+00b8
-0xb9	U+0161
-0xba	U+015f
-0xbb	U+0165
-0xbc	U+017a
-0xbd	U+02dd
-0xbe	U+017e
-0xbf	U+017c
-0xc0	U+0154
-0xc1	U+00c1
-0xc2	U+00c2
-0xc3	U+0102
-0xc4	U+00c4
-0xc5	U+0139
-0xc6	U+0106
-0xc7	U+00c7
-0xc8	U+010c
-0xc9	U+00c9
-0xca	U+0118
-0xcb	U+00cb
-0xcc	U+011a
-0xcd	U+00cd
-0xce	U+00ce
-0xcf	U+010e
-0xd0	U+0110 U+00d0
-0xd1	U+0143
-0xd2	U+0147
-0xd3	U+00d3
-0xd4	U+00d4
-0xd5	U+0150
-0xd6	U+00d6
-0xd7	U+00d7
-0xd8	U+0158
-0xd9	U+016e
-0xda	U+00da
-0xdb	U+0170
-0xdc	U+00dc
-0xdd	U+00dd
-0xde	U+0162
-0xdf	U+00df
-0xe0	U+0155
-0xe1	U+00e1
-0xe2	U+00e2
-0xe3	U+0103
-0xe4	U+00e4
-0xe5	U+013a
-0xe6	U+0107
-0xe7	U+00e7
-0xe8	U+010d
-0xe9	U+00e9
-0xea	U+0119
-0xeb	U+00eb
-0xec	U+011b
-0xed	U+00ed
-0xee	U+00ee
-0xef	U+010f
-0xf0	U+0111
-0xf1	U+0144
-0xf2	U+0148
-0xf3	U+00f3
-0xf4	U+00f4
-0xf5	U+0151
-0xf6	U+00f6
-0xf7	U+00f7
-0xf8	U+0159
-0xf9	U+016f
-0xfa	U+00fa
-0xfb	U+0171
-0xfc	U+00fc
-0xfd	U+00fd
-0xfe	U+0163
-0xff	U+02d9
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+0104	#	LATIN CAPITAL LETTER A WITH OGONEK
+0xA2	U+02D8	#	BREVE
+0xA3	U+0141	#	LATIN CAPITAL LETTER L WITH STROKE
+0xA4	U+00A4	#	CURRENCY SIGN
+0xA5	U+013D	#	LATIN CAPITAL LETTER L WITH CARON
+0xA6	U+015A	#	LATIN CAPITAL LETTER S WITH ACUTE
+0xA7	U+00A7	#	SECTION SIGN
+0xA8	U+00A8	#	DIAERESIS
+0xA9	U+0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xAA	U+015E	#	LATIN CAPITAL LETTER S WITH CEDILLA
+0xAB	U+0164	#	LATIN CAPITAL LETTER T WITH CARON
+0xAC	U+0179	#	LATIN CAPITAL LETTER Z WITH ACUTE
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAE	U+017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xAF	U+017B	#	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+0xB0	U+00B0	#	DEGREE SIGN
+0xB1	U+0105	#	LATIN SMALL LETTER A WITH OGONEK
+0xB2	U+02DB	#	OGONEK
+0xB3	U+0142	#	LATIN SMALL LETTER L WITH STROKE
+0xB4	U+00B4	#	ACUTE ACCENT
+0xB5	U+013E	#	LATIN SMALL LETTER L WITH CARON
+0xB6	U+015B	#	LATIN SMALL LETTER S WITH ACUTE
+0xB7	U+02C7	#	CARON
+0xB8	U+00B8	#	CEDILLA
+0xB9	U+0161	#	LATIN SMALL LETTER S WITH CARON
+0xBA	U+015F	#	LATIN SMALL LETTER S WITH CEDILLA
+0xBB	U+0165	#	LATIN SMALL LETTER T WITH CARON
+0xBC	U+017A	#	LATIN SMALL LETTER Z WITH ACUTE
+0xBD	U+02DD	#	DOUBLE ACUTE ACCENT
+0xBE	U+017E	#	LATIN SMALL LETTER Z WITH CARON
+0xBF	U+017C	#	LATIN SMALL LETTER Z WITH DOT ABOVE
+0xC0	U+0154	#	LATIN CAPITAL LETTER R WITH ACUTE
+0xC1	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	U+0102	#	LATIN CAPITAL LETTER A WITH BREVE
+0xC4	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	U+0139	#	LATIN CAPITAL LETTER L WITH ACUTE
+0xC6	U+0106	#	LATIN CAPITAL LETTER C WITH ACUTE
+0xC7	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	U+010C	#	LATIN CAPITAL LETTER C WITH CARON
+0xC9	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	U+0118	#	LATIN CAPITAL LETTER E WITH OGONEK
+0xCB	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	U+011A	#	LATIN CAPITAL LETTER E WITH CARON
+0xCD	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	U+010E	#	LATIN CAPITAL LETTER D WITH CARON
+0xD0	U+0110	#	LATIN CAPITAL LETTER D WITH STROKE
+0xD1	U+0143	#	LATIN CAPITAL LETTER N WITH ACUTE
+0xD2	U+0147	#	LATIN CAPITAL LETTER N WITH CARON
+0xD3	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	U+0150	#	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0xD6	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	U+00D7	#	MULTIPLICATION SIGN
+0xD8	U+0158	#	LATIN CAPITAL LETTER R WITH CARON
+0xD9	U+016E	#	LATIN CAPITAL LETTER U WITH RING ABOVE
+0xDA	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	U+0170	#	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0xDC	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	U+00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
+0xDE	U+0162	#	LATIN CAPITAL LETTER T WITH CEDILLA
+0xDF	U+00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	U+0155	#	LATIN SMALL LETTER R WITH ACUTE
+0xE1	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	U+0103	#	LATIN SMALL LETTER A WITH BREVE
+0xE4	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	U+013A	#	LATIN SMALL LETTER L WITH ACUTE
+0xE6	U+0107	#	LATIN SMALL LETTER C WITH ACUTE
+0xE7	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	U+010D	#	LATIN SMALL LETTER C WITH CARON
+0xE9	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	U+0119	#	LATIN SMALL LETTER E WITH OGONEK
+0xEB	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	U+011B	#	LATIN SMALL LETTER E WITH CARON
+0xED	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	U+010F	#	LATIN SMALL LETTER D WITH CARON
+0xF0	U+0111	#	LATIN SMALL LETTER D WITH STROKE
+0xF1	U+0144	#	LATIN SMALL LETTER N WITH ACUTE
+0xF2	U+0148	#	LATIN SMALL LETTER N WITH CARON
+0xF3	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	U+0151	#	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+0xF6	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	U+00F7	#	DIVISION SIGN
+0xF8	U+0159	#	LATIN SMALL LETTER R WITH CARON
+0xF9	U+016F	#	LATIN SMALL LETTER U WITH RING ABOVE
+0xFA	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	U+0171	#	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+0xFC	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	U+00FD	#	LATIN SMALL LETTER Y WITH ACUTE
+0xFE	U+0163	#	LATIN SMALL LETTER T WITH CEDILLA
+0xFF	U+02D9	#	DOT ABOVE
 
 
-# TRADE MARK SIGN:
-U+2122:(TM)
+0xd0	U+00d0	# Dstrok and ETH are nearly the same...
 
-0x60    U+2018          # left single quotation mark
-0x27    U+2019-U+201b   # various single quotation marks
-0x22    U+201c-U+201f   # various double quotation marks
diff --git a/src/chrtrans/iso03_uni.tbl b/src/chrtrans/iso03_uni.tbl
index 2ab5171c..bb8cd90f 100644
--- a/src/chrtrans/iso03_uni.tbl
+++ b/src/chrtrans/iso03_uni.tbl
@@ -1,149 +1,242 @@
-#
-# Unicode mapping table for ISO 8859-3 fonts iso03.*
-# [use: unicode_start iso03.f16 iso03]
-#
 #The MIME name of this charset. 
 Miso-8859-3
 
 #Name as a Display Charset (used on Options screen)
 OISO Latin 3
  
-0x20-0x7e	idem
-#0x7f		U+2302
 #
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
+#	Name:             ISO 8859-3 (1988) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-3 (1988) characters map into Unicode.
 #
-0xa0	U+00a0
-0xa1	U+0126
-0xa2	U+02d8
-0xa3	U+00a3
-0xa4	U+00a4
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-3 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-3 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
+#
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+0126	#	LATIN CAPITAL LETTER H WITH STROKE
+0xA2	U+02D8	#	BREVE
+0xA3	U+00A3	#	POUND SIGN
+0xA4	U+00A4	#	CURRENCY SIGN
+0xA6	U+0124	#	LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+0xA7	U+00A7	#	SECTION SIGN
+0xA8	U+00A8	#	DIAERESIS
+0xA9	U+0130	#	LATIN CAPITAL LETTER I WITH DOT ABOVE
+0xAA	U+015E	#	LATIN CAPITAL LETTER S WITH CEDILLA
+0xAB	U+011E	#	LATIN CAPITAL LETTER G WITH BREVE
+0xAC	U+0134	#	LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAF	U+017B	#	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+0xB0	U+00B0	#	DEGREE SIGN
+0xB1	U+0127	#	LATIN SMALL LETTER H WITH STROKE
+0xB2	U+00B2	#	SUPERSCRIPT TWO
+0xB3	U+00B3	#	SUPERSCRIPT THREE
+0xB4	U+00B4	#	ACUTE ACCENT
+0xB5	U+00B5	#	MICRO SIGN
+0xB6	U+0125	#	LATIN SMALL LETTER H WITH CIRCUMFLEX
+0xB7	U+00B7	#	MIDDLE DOT
+0xB8	U+00B8	#	CEDILLA
+0xB9	U+0131	#	LATIN SMALL LETTER DOTLESS I
+0xBA	U+015F	#	LATIN SMALL LETTER S WITH CEDILLA
+0xBB	U+011F	#	LATIN SMALL LETTER G WITH BREVE
+0xBC	U+0135	#	LATIN SMALL LETTER J WITH CIRCUMFLEX
+0xBD	U+00BD	#	VULGAR FRACTION ONE HALF
+0xBF	U+017C	#	LATIN SMALL LETTER Z WITH DOT ABOVE
+0xC0	U+00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+0xC1	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC4	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	U+010A	#	LATIN CAPITAL LETTER C WITH DOT ABOVE
+0xC6	U+0108	#	LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+0xC7	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	U+00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+0xC9	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	U+00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xCB	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	U+00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+0xCD	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	U+00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+0xD1	U+00D1	#	LATIN CAPITAL LETTER N WITH TILDE
+0xD2	U+00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+0xD3	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	U+0120	#	LATIN CAPITAL LETTER G WITH DOT ABOVE
+0xD6	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	U+00D7	#	MULTIPLICATION SIGN
+0xD8	U+011C	#	LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+0xD9	U+00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+0xDA	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	U+016C	#	LATIN CAPITAL LETTER U WITH BREVE
+0xDE	U+015C	#	LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+0xDF	U+00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	U+00E0	#	LATIN SMALL LETTER A WITH GRAVE
+0xE1	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE4	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	U+010B	#	LATIN SMALL LETTER C WITH DOT ABOVE
+0xE6	U+0109	#	LATIN SMALL LETTER C WITH CIRCUMFLEX
+0xE7	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	U+00E8	#	LATIN SMALL LETTER E WITH GRAVE
+0xE9	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	U+00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xEB	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	U+00EC	#	LATIN SMALL LETTER I WITH GRAVE
+0xED	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	U+00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+0xF1	U+00F1	#	LATIN SMALL LETTER N WITH TILDE
+0xF2	U+00F2	#	LATIN SMALL LETTER O WITH GRAVE
+0xF3	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	U+0121	#	LATIN SMALL LETTER G WITH DOT ABOVE
+0xF6	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	U+00F7	#	DIVISION SIGN
+0xF8	U+011D	#	LATIN SMALL LETTER G WITH CIRCUMFLEX
+0xF9	U+00F9	#	LATIN SMALL LETTER U WITH GRAVE
+0xFA	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	U+016D	#	LATIN SMALL LETTER U WITH BREVE
+0xFE	U+015D	#	LATIN SMALL LETTER S WITH CIRCUMFLEX
+0xFF	U+02D9	#	DOT ABOVE
+
+
+# unassigned 8859-3 codepoints:
 # 0xa5	unused
-0xa6	U+0124
-0xa7	U+00a7
-0xa8	U+00a8
-0xa9	U+0130
-0xaa	U+015e
-0xab	U+011e
-0xac	U+0134
-0xad	U+00ad
 # 0xae	unused
-0xaf	U+017b
-0xb0	U+00b0
-0xb1	U+0127
-0xb2	U+00b2
-0xb3	U+00b3
-0xb4	U+00b4
-0xb5	U+00b5
-0xb6	U+0125
-0xb7	U+00b7
-0xb8	U+00b8
-0xb9	U+0131
-0xba	U+015f
-0xbb	U+011f
-0xbc	U+0135
-0xbd	U+00bd
 # 0xbe	unused
-0xbf	U+017c
-0xc0	U+00c0
-0xc1	U+00c1
-0xc2	U+00c2
 # 0xc3	unused
-0xc4	U+00c4
-0xc5	U+010a
-0xc6	U+0108
-0xc7	U+00c7
-0xc8	U+00c8
-0xc9	U+00c9
-0xca	U+00ca
-0xcb	U+00cb
-0xcc	U+00cc
-0xcd	U+00cd
-0xce	U+00ce
-0xcf	U+00cf
 # 0xd0	unused
-0xd1	U+00d1
-0xd2	U+00d2
-0xd3	U+00d3
-0xd4	U+00d4
-0xd5	U+0120
-0xd6	U+00d6
-0xd7	U+00d7
-0xd8	U+011c
-0xd9	U+00d9
-0xda	U+00da
-0xdb	U+00db
-0xdc	U+00dc
-0xdd	U+016c
-0xde	U+015c
-0xdf	U+00df
-0xe0	U+00e0
-0xe1	U+00e1
-0xe2	U+00e2
 # 0xe3	unused
-0xe4	U+00e4
-0xe5	U+010b
-0xe6	U+0109
-0xe7	U+00e7
-0xe8	U+00e8
-0xe9	U+00e9
-0xea	U+00ea
-0xeb	U+00eb
-0xec	U+00ec
-0xed	U+00ed
-0xee	U+00ee
-0xef	U+00ef
 # 0xf0	unused
-0xf1	U+00f1
-0xf2	U+00f2
-0xf3	U+00f3
-0xf4	U+00f4
-0xf5	U+0121
-0xf6	U+00f6
-0xf7	U+00f7
-0xf8	U+011d
-0xf9	U+00f9
-0xfa	U+00fa
-0xfb	U+00fb
-0xfc	U+00fc
-0xfd	U+016d
-0xfe	U+015d
-0xff	U+02d9
 
-# TRADE MARK SIGN:
-U+2122:(TM)
diff --git a/src/chrtrans/iso04_uni.tbl b/src/chrtrans/iso04_uni.tbl
index ed5d469a..3f54afda 100644
--- a/src/chrtrans/iso04_uni.tbl
+++ b/src/chrtrans/iso04_uni.tbl
@@ -1,149 +1,241 @@
-#
-# Unicode mapping table for ISO 8859-4 fonts iso04.*
-# [use: unicode_start iso04.f16 iso04]
-#
 #The MIME name of this charset. 
 Miso-8859-4
 
 #Name as a Display Charset (used on Options screen)
 OISO Latin 4
  
-0x20-0x7e	idem
-#0x7f		U+2302
 #
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
+#	Name:             ISO 8859-4 (1988) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
 #
-0xa0	U+00a0
-0xa1	U+0104
-0xa2	U+0138
-0xa3	U+0156
-0xa4	U+00a4
-0xa5	U+0128
-0xa6	U+013b
-0xa7	U+00a7
-0xa8	U+00a8
-0xa9	U+0160
-0xaa	U+0112
-0xab	U+0122
-0xac	U+0166
-0xad	U+00ad
-0xae	U+017d
-0xaf	U+00af
-0xb0	U+00b0
-0xb1	U+0105
-0xb2	U+02db
-0xb3	U+0157
-0xb4	U+00b4
-0xb5	U+0129
-0xb6	U+013c
-0xb7	U+02c7
-0xb8	U+00b8
-0xb9	U+0161
-0xba	U+0113
-0xbb	U+0123
-0xbc	U+0167
-0xbd	U+014a
-0xbe	U+017e
-0xbf	U+014b
-0xc0	U+0100
-0xc1	U+00c1
-0xc2	U+00c2
-0xc3	U+00c3
-0xc4	U+00c4
-0xc5	U+00c5
-0xc6	U+00c6
-0xc7	U+012e
-0xc8	U+010c
-0xc9	U+00c9
-0xca	U+0118
-0xcb	U+00cb
-0xcc	U+0116
-0xcd	U+00cd
-0xce	U+00ce
-0xcf	U+012a
-0xd0	U+0110
-0xd1	U+0145
-0xd2	U+014c
-0xd3	U+0136
-0xd4	U+00d4
-0xd5	U+00d5
-0xd6	U+00d6
-0xd7	U+00d7
-0xd8	U+00d8
-0xd9	U+0172
-0xda	U+00da
-0xdb	U+00db
-0xdc	U+00dc
-0xdd	U+0168
-0xde	U+016a
-0xdf	U+00df
-0xe0	U+0101
-0xe1	U+00e1
-0xe2	U+00e2
-0xe3	U+00e3
-0xe4	U+00e4
-0xe5	U+00e5
-0xe6	U+00e6
-0xe7	U+012f
-0xe8	U+010d
-0xe9	U+00e9
-0xea	U+0119
-0xeb	U+00eb
-0xec	U+0117
-0xed	U+00ed
-0xee	U+00ee
-0xef	U+012b
-0xf0	U+0111
-0xf1	U+0146
-0xf2	U+014d
-0xf3	U+0137
-0xf4	U+00f4
-0xf5	U+00f5
-0xf6	U+00f6
-0xf7	U+00f7
-0xf8	U+00f8
-0xf9	U+0173
-0xfa	U+00fa
-0xfb	U+00fb
-0xfc	U+00fc
-0xfd	U+0169
-0xfe	U+016b
-0xff	U+02d9
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-4 (1988) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-4 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-4 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
+#
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+0104	#	LATIN CAPITAL LETTER A WITH OGONEK
+0xA2	U+0138	#	LATIN SMALL LETTER KRA
+0xA3	U+0156	#	LATIN CAPITAL LETTER R WITH CEDILLA
+0xA4	U+00A4	#	CURRENCY SIGN
+0xA5	U+0128	#	LATIN CAPITAL LETTER I WITH TILDE
+0xA6	U+013B	#	LATIN CAPITAL LETTER L WITH CEDILLA
+0xA7	U+00A7	#	SECTION SIGN
+0xA8	U+00A8	#	DIAERESIS
+0xA9	U+0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xAA	U+0112	#	LATIN CAPITAL LETTER E WITH MACRON
+0xAB	U+0122	#	LATIN CAPITAL LETTER G WITH CEDILLA
+0xAC	U+0166	#	LATIN CAPITAL LETTER T WITH STROKE
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAE	U+017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xAF	U+00AF	#	MACRON
+0xB0	U+00B0	#	DEGREE SIGN
+0xB1	U+0105	#	LATIN SMALL LETTER A WITH OGONEK
+0xB2	U+02DB	#	OGONEK
+0xB3	U+0157	#	LATIN SMALL LETTER R WITH CEDILLA
+0xB4	U+00B4	#	ACUTE ACCENT
+0xB5	U+0129	#	LATIN SMALL LETTER I WITH TILDE
+0xB6	U+013C	#	LATIN SMALL LETTER L WITH CEDILLA
+0xB7	U+02C7	#	CARON
+0xB8	U+00B8	#	CEDILLA
+0xB9	U+0161	#	LATIN SMALL LETTER S WITH CARON
+0xBA	U+0113	#	LATIN SMALL LETTER E WITH MACRON
+0xBB	U+0123	#	LATIN SMALL LETTER G WITH CEDILLA
+0xBC	U+0167	#	LATIN SMALL LETTER T WITH STROKE
+0xBD	U+014A	#	LATIN CAPITAL LETTER ENG
+0xBE	U+017E	#	LATIN SMALL LETTER Z WITH CARON
+0xBF	U+014B	#	LATIN SMALL LETTER ENG
+0xC0	U+0100	#	LATIN CAPITAL LETTER A WITH MACRON
+0xC1	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	U+00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+0xC4	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	U+00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xC6	U+00C6	#	LATIN CAPITAL LETTER AE
+0xC7	U+012E	#	LATIN CAPITAL LETTER I WITH OGONEK
+0xC8	U+010C	#	LATIN CAPITAL LETTER C WITH CARON
+0xC9	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	U+0118	#	LATIN CAPITAL LETTER E WITH OGONEK
+0xCB	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	U+0116	#	LATIN CAPITAL LETTER E WITH DOT ABOVE
+0xCD	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	U+012A	#	LATIN CAPITAL LETTER I WITH MACRON
+0xD0	U+0110	#	LATIN CAPITAL LETTER D WITH STROKE
+0xD1	U+0145	#	LATIN CAPITAL LETTER N WITH CEDILLA
+0xD2	U+014C	#	LATIN CAPITAL LETTER O WITH MACRON
+0xD3	U+0136	#	LATIN CAPITAL LETTER K WITH CEDILLA
+0xD4	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	U+00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xD6	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	U+00D7	#	MULTIPLICATION SIGN
+0xD8	U+00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xD9	U+0172	#	LATIN CAPITAL LETTER U WITH OGONEK
+0xDA	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	U+0168	#	LATIN CAPITAL LETTER U WITH TILDE
+0xDE	U+016A	#	LATIN CAPITAL LETTER U WITH MACRON
+0xDF	U+00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	U+0101	#	LATIN SMALL LETTER A WITH MACRON
+0xE1	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	U+00E3	#	LATIN SMALL LETTER A WITH TILDE
+0xE4	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	U+00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xE6	U+00E6	#	LATIN SMALL LETTER AE
+0xE7	U+012F	#	LATIN SMALL LETTER I WITH OGONEK
+0xE8	U+010D	#	LATIN SMALL LETTER C WITH CARON
+0xE9	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	U+0119	#	LATIN SMALL LETTER E WITH OGONEK
+0xEB	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	U+0117	#	LATIN SMALL LETTER E WITH DOT ABOVE
+0xED	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	U+012B	#	LATIN SMALL LETTER I WITH MACRON
+0xF0	U+0111	#	LATIN SMALL LETTER D WITH STROKE
+0xF1	U+0146	#	LATIN SMALL LETTER N WITH CEDILLA
+0xF2	U+014D	#	LATIN SMALL LETTER O WITH MACRON
+0xF3	U+0137	#	LATIN SMALL LETTER K WITH CEDILLA
+0xF4	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	U+00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xF6	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	U+00F7	#	DIVISION SIGN
+0xF8	U+00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xF9	U+0173	#	LATIN SMALL LETTER U WITH OGONEK
+0xFA	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	U+0169	#	LATIN SMALL LETTER U WITH TILDE
+0xFE	U+016B	#	LATIN SMALL LETTER U WITH MACRON
+0xFF	U+02D9	#	DOT ABOVE
+
 
-# TRADE MARK SIGN:
-U+2122:(TM)
+0xd0	U+00d0	# Dstrok and ETH are nearly the same...
diff --git a/src/chrtrans/iso05_uni.tbl b/src/chrtrans/iso05_uni.tbl
index f0dfad50..40cdc24d 100644
--- a/src/chrtrans/iso05_uni.tbl
+++ b/src/chrtrans/iso05_uni.tbl
@@ -1,149 +1,239 @@
-#
-# Unicode mapping table for ISO 8859-5 fonts iso05.*
-# [use: unicode_start iso05.f16 iso05]
-#
 #The MIME name of this charset. 
 Miso-8859-5
 
 #Name as a Display Charset (used on Options screen)
 OISO 8859-5 Cyrillic
 
-0x20-0x7e	idem
-#0x7f		U+2302
 #
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
+#	Name:             ISO 8859-5 (1988) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-5 (1988) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-5 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-5 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
 #
-0xa0	U+00a0
-0xa1	U+0401
-0xa2	U+0402
-0xa3	U+0403
-0xa4	U+0404
-0xa5	U+0405
-0xa6	U+0406
-0xa7	U+0407
-0xa8	U+0408
-0xa9	U+0409
-0xaa	U+040a
-0xab	U+040b
-0xac	U+040c
-0xad	U+00ad
-0xae	U+040e
-0xaf	U+040f
-0xb0	U+0410
-0xb1	U+0411
-0xb2	U+0412
-0xb3	U+0413
-0xb4	U+0414
-0xb5	U+0415
-0xb6	U+0416
-0xb7	U+0417
-0xb8	U+0418
-0xb9	U+0419
-0xba	U+041a
-0xbb	U+041b
-0xbc	U+041c
-0xbd	U+041d
-0xbe	U+041e
-0xbf	U+041f
-0xc0	U+0420
-0xc1	U+0421
-0xc2	U+0422
-0xc3	U+0423
-0xc4	U+0424
-0xc5	U+0425
-0xc6	U+0426
-0xc7	U+0427
-0xc8	U+0428
-0xc9	U+0429
-0xca	U+042a
-0xcb	U+042b
-0xcc	U+042c
-0xcd	U+042d
-0xce	U+042e
-0xcf	U+042f
-0xd0	U+0430
-0xd1	U+0431
-0xd2	U+0432
-0xd3	U+0433
-0xd4	U+0434
-0xd5	U+0435
-0xd6	U+0436
-0xd7	U+0437
-0xd8	U+0438
-0xd9	U+0439
-0xda	U+043a
-0xdb	U+043b
-0xdc	U+043c
-0xdd	U+043d
-0xde	U+043e
-0xdf	U+043f
-0xe0	U+0440
-0xe1	U+0441
-0xe2	U+0442
-0xe3	U+0443
-0xe4	U+0444
-0xe5	U+0445
-0xe6	U+0446
-0xe7	U+0447
-0xe8	U+0448
-0xe9	U+0449
-0xea	U+044a
-0xeb	U+044b
-0xec	U+044c
-0xed	U+044d
-0xee	U+044e
-0xef	U+044f
-0xf0	U+2116
-0xf1	U+0451
-0xf2	U+0452
-0xf3	U+0453
-0xf4	U+0454
-0xf5	U+0455
-0xf6	U+0456
-0xf7	U+0457
-0xf8	U+0458
-0xf9	U+0459
-0xfa	U+045a
-0xfb	U+045b
-0xfc	U+045c
-0xfd	U+00a7
-0xfe	U+045e
-0xff	U+045f
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+0401	#	CYRILLIC CAPITAL LETTER IO
+0xA2	U+0402	#	CYRILLIC CAPITAL LETTER DJE
+0xA3	U+0403	#	CYRILLIC CAPITAL LETTER GJE
+0xA4	U+0404	#	CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0xA5	U+0405	#	CYRILLIC CAPITAL LETTER DZE
+0xA6	U+0406	#	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0xA7	U+0407	#	CYRILLIC CAPITAL LETTER YI
+0xA8	U+0408	#	CYRILLIC CAPITAL LETTER JE
+0xA9	U+0409	#	CYRILLIC CAPITAL LETTER LJE
+0xAA	U+040A	#	CYRILLIC CAPITAL LETTER NJE
+0xAB	U+040B	#	CYRILLIC CAPITAL LETTER TSHE
+0xAC	U+040C	#	CYRILLIC CAPITAL LETTER KJE
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAE	U+040E	#	CYRILLIC CAPITAL LETTER SHORT U
+0xAF	U+040F	#	CYRILLIC CAPITAL LETTER DZHE
+0xB0	U+0410	#	CYRILLIC CAPITAL LETTER A
+0xB1	U+0411	#	CYRILLIC CAPITAL LETTER BE
+0xB2	U+0412	#	CYRILLIC CAPITAL LETTER VE
+0xB3	U+0413	#	CYRILLIC CAPITAL LETTER GHE
+0xB4	U+0414	#	CYRILLIC CAPITAL LETTER DE
+0xB5	U+0415	#	CYRILLIC CAPITAL LETTER IE
+0xB6	U+0416	#	CYRILLIC CAPITAL LETTER ZHE
+0xB7	U+0417	#	CYRILLIC CAPITAL LETTER ZE
+0xB8	U+0418	#	CYRILLIC CAPITAL LETTER I
+0xB9	U+0419	#	CYRILLIC CAPITAL LETTER SHORT I
+0xBA	U+041A	#	CYRILLIC CAPITAL LETTER KA
+0xBB	U+041B	#	CYRILLIC CAPITAL LETTER EL
+0xBC	U+041C	#	CYRILLIC CAPITAL LETTER EM
+0xBD	U+041D	#	CYRILLIC CAPITAL LETTER EN
+0xBE	U+041E	#	CYRILLIC CAPITAL LETTER O
+0xBF	U+041F	#	CYRILLIC CAPITAL LETTER PE
+0xC0	U+0420	#	CYRILLIC CAPITAL LETTER ER
+0xC1	U+0421	#	CYRILLIC CAPITAL LETTER ES
+0xC2	U+0422	#	CYRILLIC CAPITAL LETTER TE
+0xC3	U+0423	#	CYRILLIC CAPITAL LETTER U
+0xC4	U+0424	#	CYRILLIC CAPITAL LETTER EF
+0xC5	U+0425	#	CYRILLIC CAPITAL LETTER HA
+0xC6	U+0426	#	CYRILLIC CAPITAL LETTER TSE
+0xC7	U+0427	#	CYRILLIC CAPITAL LETTER CHE
+0xC8	U+0428	#	CYRILLIC CAPITAL LETTER SHA
+0xC9	U+0429	#	CYRILLIC CAPITAL LETTER SHCHA
+0xCA	U+042A	#	CYRILLIC CAPITAL LETTER HARD SIGN
+0xCB	U+042B	#	CYRILLIC CAPITAL LETTER YERU
+0xCC	U+042C	#	CYRILLIC CAPITAL LETTER SOFT SIGN
+0xCD	U+042D	#	CYRILLIC CAPITAL LETTER E
+0xCE	U+042E	#	CYRILLIC CAPITAL LETTER YU
+0xCF	U+042F	#	CYRILLIC CAPITAL LETTER YA
+0xD0	U+0430	#	CYRILLIC SMALL LETTER A
+0xD1	U+0431	#	CYRILLIC SMALL LETTER BE
+0xD2	U+0432	#	CYRILLIC SMALL LETTER VE
+0xD3	U+0433	#	CYRILLIC SMALL LETTER GHE
+0xD4	U+0434	#	CYRILLIC SMALL LETTER DE
+0xD5	U+0435	#	CYRILLIC SMALL LETTER IE
+0xD6	U+0436	#	CYRILLIC SMALL LETTER ZHE
+0xD7	U+0437	#	CYRILLIC SMALL LETTER ZE
+0xD8	U+0438	#	CYRILLIC SMALL LETTER I
+0xD9	U+0439	#	CYRILLIC SMALL LETTER SHORT I
+0xDA	U+043A	#	CYRILLIC SMALL LETTER KA
+0xDB	U+043B	#	CYRILLIC SMALL LETTER EL
+0xDC	U+043C	#	CYRILLIC SMALL LETTER EM
+0xDD	U+043D	#	CYRILLIC SMALL LETTER EN
+0xDE	U+043E	#	CYRILLIC SMALL LETTER O
+0xDF	U+043F	#	CYRILLIC SMALL LETTER PE
+0xE0	U+0440	#	CYRILLIC SMALL LETTER ER
+0xE1	U+0441	#	CYRILLIC SMALL LETTER ES
+0xE2	U+0442	#	CYRILLIC SMALL LETTER TE
+0xE3	U+0443	#	CYRILLIC SMALL LETTER U
+0xE4	U+0444	#	CYRILLIC SMALL LETTER EF
+0xE5	U+0445	#	CYRILLIC SMALL LETTER HA
+0xE6	U+0446	#	CYRILLIC SMALL LETTER TSE
+0xE7	U+0447	#	CYRILLIC SMALL LETTER CHE
+0xE8	U+0448	#	CYRILLIC SMALL LETTER SHA
+0xE9	U+0449	#	CYRILLIC SMALL LETTER SHCHA
+0xEA	U+044A	#	CYRILLIC SMALL LETTER HARD SIGN
+0xEB	U+044B	#	CYRILLIC SMALL LETTER YERU
+0xEC	U+044C	#	CYRILLIC SMALL LETTER SOFT SIGN
+0xED	U+044D	#	CYRILLIC SMALL LETTER E
+0xEE	U+044E	#	CYRILLIC SMALL LETTER YU
+0xEF	U+044F	#	CYRILLIC SMALL LETTER YA
+0xF0	U+2116	#	NUMERO SIGN
+0xF1	U+0451	#	CYRILLIC SMALL LETTER IO
+0xF2	U+0452	#	CYRILLIC SMALL LETTER DJE
+0xF3	U+0453	#	CYRILLIC SMALL LETTER GJE
+0xF4	U+0454	#	CYRILLIC SMALL LETTER UKRAINIAN IE
+0xF5	U+0455	#	CYRILLIC SMALL LETTER DZE
+0xF6	U+0456	#	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+0xF7	U+0457	#	CYRILLIC SMALL LETTER YI
+0xF8	U+0458	#	CYRILLIC SMALL LETTER JE
+0xF9	U+0459	#	CYRILLIC SMALL LETTER LJE
+0xFA	U+045A	#	CYRILLIC SMALL LETTER NJE
+0xFB	U+045B	#	CYRILLIC SMALL LETTER TSHE
+0xFC	U+045C	#	CYRILLIC SMALL LETTER KJE
+0xFD	U+00A7	#	SECTION SIGN
+0xFE	U+045E	#	CYRILLIC SMALL LETTER SHORT U
+0xFF	U+045F	#	CYRILLIC SMALL LETTER DZHE
 
-# TRADE MARK SIGN:
-U+2122:(TM)
diff --git a/src/chrtrans/iso06_uni.tbl b/src/chrtrans/iso06_uni.tbl
index fd3452da..c9418864 100644
--- a/src/chrtrans/iso06_uni.tbl
+++ b/src/chrtrans/iso06_uni.tbl
@@ -1,113 +1,195 @@
-#
-# Unicode mapping table for ISO 8859-6 fonts iso06.*
-# [use: unicode_start iso06.f16 iso06]
-#
 #The MIME name of this charset.
 Miso-8859-6
 
 #Name as a Display Charset (used on Options screen).
 OISO 8859-6 Arabic
 
-0x20-0x7e	idem
-#0x7f		U+2302
 #
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
+#	Name:             ISO 8859-6 (1987) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
 #
-0xa0	U+00a0
-0xa4	U+00a4
-0xac	U+060c
-0xad	U+00ad
-0xbb	U+061b
-0xbf	U+061f
-0xc1	U+0621
-0xc2	U+0622
-0xc3	U+0623
-0xc4	U+0624
-0xc5	U+0625
-0xc6	U+0626
-0xc7	U+0627
-0xc8	U+0628
-0xc9	U+0629
-0xca	U+062a
-0xcb	U+062b
-0xcc	U+062c
-0xcd	U+062d
-0xce	U+062e
-0xcf	U+062f
-0xd0	U+0630
-0xd1	U+0631
-0xd2	U+0632
-0xd3	U+0633
-0xd4	U+0634
-0xd5	U+0635
-0xd6	U+0636
-0xd7	U+0637
-0xd8	U+0638
-0xd9	U+0639
-0xda	U+063a
-0xe0	U+0640
-0xe1	U+0641
-0xe2	U+0642
-0xe3	U+0643
-0xe4	U+0644
-0xe5	U+0645
-0xe6	U+0646
-0xe7	U+0647
-0xe8	U+0648
-0xe9	U+0649
-0xea	U+064a
-0xeb	U+064b
-0xec	U+064c
-0xed	U+064d
-0xee	U+064e
-0xef	U+064f
-0xf0	U+0650
-0xf1	U+0651
-0xf2	U+0652
-
-# TRADE MARK SIGN:
-U+2122:(TM)
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-6 (1987) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-6 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-6 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
+#
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0660	#	ARABIC-INDIC DIGIT ZERO
+#0x31	U+0661	#	ARABIC-INDIC DIGIT ONE
+#0x32	U+0662	#	ARABIC-INDIC DIGIT TWO
+#0x33	U+0663	#	ARABIC-INDIC DIGIT THREE
+#0x34	U+0664	#	ARABIC-INDIC DIGIT FOUR
+#0x35	U+0665	#	ARABIC-INDIC DIGIT FIVE
+#0x36	U+0666	#	ARABIC-INDIC DIGIT SIX
+#0x37	U+0667	#	ARABIC-INDIC DIGIT SEVEN
+#0x38	U+0668	#	ARABIC-INDIC DIGIT EIGHT
+#0x39	U+0669	#	ARABIC-INDIC DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA4	U+00A4	#	CURRENCY SIGN
+0xAC	U+060C	#	ARABIC COMMA
+0xAD	U+00AD	#	SOFT HYPHEN
+0xBB	U+061B	#	ARABIC SEMICOLON
+0xBF	U+061F	#	ARABIC QUESTION MARK
+0xC1	U+0621	#	ARABIC LETTER HAMZA
+0xC2	U+0622	#	ARABIC LETTER ALEF WITH MADDA ABOVE
+0xC3	U+0623	#	ARABIC LETTER ALEF WITH HAMZA ABOVE
+0xC4	U+0624	#	ARABIC LETTER WAW WITH HAMZA ABOVE
+0xC5	U+0625	#	ARABIC LETTER ALEF WITH HAMZA BELOW
+0xC6	U+0626	#	ARABIC LETTER YEH WITH HAMZA ABOVE
+0xC7	U+0627	#	ARABIC LETTER ALEF
+0xC8	U+0628	#	ARABIC LETTER BEH
+0xC9	U+0629	#	ARABIC LETTER TEH MARBUTA
+0xCA	U+062A	#	ARABIC LETTER TEH
+0xCB	U+062B	#	ARABIC LETTER THEH
+0xCC	U+062C	#	ARABIC LETTER JEEM
+0xCD	U+062D	#	ARABIC LETTER HAH
+0xCE	U+062E	#	ARABIC LETTER KHAH
+0xCF	U+062F	#	ARABIC LETTER DAL
+0xD0	U+0630	#	ARABIC LETTER THAL
+0xD1	U+0631	#	ARABIC LETTER REH
+0xD2	U+0632	#	ARABIC LETTER ZAIN
+0xD3	U+0633	#	ARABIC LETTER SEEN
+0xD4	U+0634	#	ARABIC LETTER SHEEN
+0xD5	U+0635	#	ARABIC LETTER SAD
+0xD6	U+0636	#	ARABIC LETTER DAD
+0xD7	U+0637	#	ARABIC LETTER TAH
+0xD8	U+0638	#	ARABIC LETTER ZAH
+0xD9	U+0639	#	ARABIC LETTER AIN
+0xDA	U+063A	#	ARABIC LETTER GHAIN
+0xE0	U+0640	#	ARABIC TATWEEL
+0xE1	U+0641	#	ARABIC LETTER FEH
+0xE2	U+0642	#	ARABIC LETTER QAF
+0xE3	U+0643	#	ARABIC LETTER KAF
+0xE4	U+0644	#	ARABIC LETTER LAM
+0xE5	U+0645	#	ARABIC LETTER MEEM
+0xE6	U+0646	#	ARABIC LETTER NOON
+0xE7	U+0647	#	ARABIC LETTER HEH
+0xE8	U+0648	#	ARABIC LETTER WAW
+0xE9	U+0649	#	ARABIC LETTER ALEF MAKSURA
+0xEA	U+064A	#	ARABIC LETTER YEH
+0xEB	U+064B	#	ARABIC FATHATAN
+0xEC	U+064C	#	ARABIC DAMMATAN
+0xED	U+064D	#	ARABIC KASRATAN
+0xEE	U+064E	#	ARABIC FATHA
+0xEF	U+064F	#	ARABIC DAMMA
+0xF0	U+0650	#	ARABIC KASRA
+0xF1	U+0651	#	ARABIC SHADDA
+0xF2	U+0652	#	ARABIC SUKUN
 
-0x60    U+2018          # left single quotation mark <`>
-0x27    U+2019-U+201b   # various single quotation marks <'>
-0x22    U+201c-U+201f   # various double quotation marks <">
 
-# Let's try to show a question mark for character that cannot
-# be shown.  U+fffd is used for invalid characters.
-# It works, but let's stick with UHHH representatiion. - FM
-#U+fffd:?
diff --git a/src/chrtrans/iso07_uni.tbl b/src/chrtrans/iso07_uni.tbl
index 62a85b3c..368209bf 100644
--- a/src/chrtrans/iso07_uni.tbl
+++ b/src/chrtrans/iso07_uni.tbl
@@ -1,143 +1,233 @@
-#
-# Unicode mapping table for ISO 8859-7 fonts iso07.*
-# [use: unicode_start iso07.f16 iso07]
-#
 #The MIME name of this charset. 
 Miso-8859-7
 
 #Name as a Display Charset (used on Options screen)
 OISO 8859-7 Greek
  
-0x20-0x7e	idem
-#0x7f		U+2302
 #
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
+#	Name:             ISO 8859-7 (1987) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-7 (1987) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-7 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-7 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
 #
-0xa0	U+00a0
-0xa1	U+0371
-0xa2	U+0372
-0xa3	U+00a3
-0xa6	U+00a6
-0xa7	U+00a7
-0xa8	U+00a8
-0xa9	U+00a9
-0xab	U+00ab
-0xac	U+00ac
-0xad	U+00ad
-0xaf	U+2015
-0xb0	U+00b0
-0xb1	U+00b1
-0xb2	U+00b2
-0xb3	U+00b3
-0xb4	U+03f3
-0xb5	U+03f4
-0xb6	U+0386
-0xb7	U+00b7
-0xb8	U+0388
-0xb9	U+0389
-0xba	U+038a
-0xbb	U+00bb
-0xbc	U+038c
-0xbd	U+00bd
-0xbe	U+038e
-0xbf	U+038f
-0xc0	U+0390
-0xc1	U+0391
-0xc2	U+0392
-0xc3	U+0393
-0xc4	U+0394
-0xc5	U+0395
-0xc6	U+0396
-0xc7	U+0397
-0xc8	U+0398
-0xc9	U+0399
-0xca	U+039a
-0xcb	U+039b
-0xcc	U+039c
-0xcd	U+039d
-0xce	U+039e
-0xcf	U+039f
-0xd0	U+03a0
-0xd1	U+03a1
-0xd3	U+03a3
-0xd4	U+03a4
-0xd5	U+03a5
-0xd6	U+03a6
-0xd7	U+03a7
-0xd8	U+03a8
-0xd9	U+03a9
-0xda	U+03aa
-0xdb	U+03ab
-0xdc	U+03ac
-0xdd	U+03ad
-0xde	U+03ae
-0xdf	U+03af
-0xe0	U+03b0
-0xe1	U+03b1
-0xe2	U+03b2
-0xe3	U+03b3
-0xe4	U+03b4
-0xe5	U+03b5
-0xe6	U+03b6
-0xe7	U+03b7
-0xe8	U+03b8
-0xe9	U+03b9
-0xea	U+03ba
-0xeb	U+03bb
-0xec	U+03bc
-0xed	U+03bd
-0xee	U+03be
-0xef	U+03bf
-0xf0	U+03c0
-0xf1	U+03c1
-0xf2	U+03c2
-0xf3	U+03c3
-0xf4	U+03c4
-0xf5	U+03c5
-0xf6	U+03c6
-0xf7	U+03c7
-0xf8	U+03c8
-0xf9	U+03c9
-0xfa	U+03ca
-0xfb	U+03cb
-0xfc	U+03cc
-0xfd	U+03cd
-0xfe	U+03ce
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+02BD	#	MODIFIER LETTER REVERSED COMMA
+0xA2	U+02BC	#	MODIFIER LETTER APOSTROPHE
+0xA3	U+00A3	#	POUND SIGN
+0xA6	U+00A6	#	BROKEN BAR
+0xA7	U+00A7	#	SECTION SIGN
+0xA8	U+00A8	#	DIAERESIS
+0xA9	U+00A9	#	COPYRIGHT SIGN
+0xAB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	U+00AC	#	NOT SIGN
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAF	U+2015	#	HORIZONTAL BAR
+0xB0	U+00B0	#	DEGREE SIGN
+0xB1	U+00B1	#	PLUS-MINUS SIGN
+0xB2	U+00B2	#	SUPERSCRIPT TWO
+0xB3	U+00B3	#	SUPERSCRIPT THREE
+0xB4	U+0384	#	GREEK TONOS
+0xB5	U+0385	#	GREEK DIALYTIKA TONOS
+0xB6	U+0386	#	GREEK CAPITAL LETTER ALPHA WITH TONOS
+0xB7	U+00B7	#	MIDDLE DOT
+0xB8	U+0388	#	GREEK CAPITAL LETTER EPSILON WITH TONOS
+0xB9	U+0389	#	GREEK CAPITAL LETTER ETA WITH TONOS
+0xBA	U+038A	#	GREEK CAPITAL LETTER IOTA WITH TONOS
+0xBB	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	U+038C	#	GREEK CAPITAL LETTER OMICRON WITH TONOS
+0xBD	U+00BD	#	VULGAR FRACTION ONE HALF
+0xBE	U+038E	#	GREEK CAPITAL LETTER UPSILON WITH TONOS
+0xBF	U+038F	#	GREEK CAPITAL LETTER OMEGA WITH TONOS
+0xC0	U+0390	#	GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+0xC1	U+0391	#	GREEK CAPITAL LETTER ALPHA
+0xC2	U+0392	#	GREEK CAPITAL LETTER BETA
+0xC3	U+0393	#	GREEK CAPITAL LETTER GAMMA
+0xC4	U+0394	#	GREEK CAPITAL LETTER DELTA
+0xC5	U+0395	#	GREEK CAPITAL LETTER EPSILON
+0xC6	U+0396	#	GREEK CAPITAL LETTER ZETA
+0xC7	U+0397	#	GREEK CAPITAL LETTER ETA
+0xC8	U+0398	#	GREEK CAPITAL LETTER THETA
+0xC9	U+0399	#	GREEK CAPITAL LETTER IOTA
+0xCA	U+039A	#	GREEK CAPITAL LETTER KAPPA
+0xCB	U+039B	#	GREEK CAPITAL LETTER LAMDA
+0xCC	U+039C	#	GREEK CAPITAL LETTER MU
+0xCD	U+039D	#	GREEK CAPITAL LETTER NU
+0xCE	U+039E	#	GREEK CAPITAL LETTER XI
+0xCF	U+039F	#	GREEK CAPITAL LETTER OMICRON
+0xD0	U+03A0	#	GREEK CAPITAL LETTER PI
+0xD1	U+03A1	#	GREEK CAPITAL LETTER RHO
+0xD3	U+03A3	#	GREEK CAPITAL LETTER SIGMA
+0xD4	U+03A4	#	GREEK CAPITAL LETTER TAU
+0xD5	U+03A5	#	GREEK CAPITAL LETTER UPSILON
+0xD6	U+03A6	#	GREEK CAPITAL LETTER PHI
+0xD7	U+03A7	#	GREEK CAPITAL LETTER CHI
+0xD8	U+03A8	#	GREEK CAPITAL LETTER PSI
+0xD9	U+03A9	#	GREEK CAPITAL LETTER OMEGA
+0xDA	U+03AA	#	GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+0xDB	U+03AB	#	GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+0xDC	U+03AC	#	GREEK SMALL LETTER ALPHA WITH TONOS
+0xDD	U+03AD	#	GREEK SMALL LETTER EPSILON WITH TONOS
+0xDE	U+03AE	#	GREEK SMALL LETTER ETA WITH TONOS
+0xDF	U+03AF	#	GREEK SMALL LETTER IOTA WITH TONOS
+0xE0	U+03B0	#	GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+0xE1	U+03B1	#	GREEK SMALL LETTER ALPHA
+0xE2	U+03B2	#	GREEK SMALL LETTER BETA
+0xE3	U+03B3	#	GREEK SMALL LETTER GAMMA
+0xE4	U+03B4	#	GREEK SMALL LETTER DELTA
+0xE5	U+03B5	#	GREEK SMALL LETTER EPSILON
+0xE6	U+03B6	#	GREEK SMALL LETTER ZETA
+0xE7	U+03B7	#	GREEK SMALL LETTER ETA
+0xE8	U+03B8	#	GREEK SMALL LETTER THETA
+0xE9	U+03B9	#	GREEK SMALL LETTER IOTA
+0xEA	U+03BA	#	GREEK SMALL LETTER KAPPA
+0xEB	U+03BB	#	GREEK SMALL LETTER LAMDA
+0xEC	U+03BC	#	GREEK SMALL LETTER MU
+0xED	U+03BD	#	GREEK SMALL LETTER NU
+0xEE	U+03BE	#	GREEK SMALL LETTER XI
+0xEF	U+03BF	#	GREEK SMALL LETTER OMICRON
+0xF0	U+03C0	#	GREEK SMALL LETTER PI
+0xF1	U+03C1	#	GREEK SMALL LETTER RHO
+0xF2	U+03C2	#	GREEK SMALL LETTER FINAL SIGMA
+0xF3	U+03C3	#	GREEK SMALL LETTER SIGMA
+0xF4	U+03C4	#	GREEK SMALL LETTER TAU
+0xF5	U+03C5	#	GREEK SMALL LETTER UPSILON
+0xF6	U+03C6	#	GREEK SMALL LETTER PHI
+0xF7	U+03C7	#	GREEK SMALL LETTER CHI
+0xF8	U+03C8	#	GREEK SMALL LETTER PSI
+0xF9	U+03C9	#	GREEK SMALL LETTER OMEGA
+0xFA	U+03CA	#	GREEK SMALL LETTER IOTA WITH DIALYTIKA
+0xFB	U+03CB	#	GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+0xFC	U+03CC	#	GREEK SMALL LETTER OMICRON WITH TONOS
+0xFD	U+03CD	#	GREEK SMALL LETTER UPSILON WITH TONOS
+0xFE	U+03CE	#	GREEK SMALL LETTER OMEGA WITH TONOS
 
-# TRADE MARK SIGN:
-U+2122:(TM)
diff --git a/src/chrtrans/iso08_uni.tbl b/src/chrtrans/iso08_uni.tbl
index bc2bb647..4d83f5c4 100644
--- a/src/chrtrans/iso08_uni.tbl
+++ b/src/chrtrans/iso08_uni.tbl
@@ -1,90 +1,204 @@
-#
-# Unicode mapping table for ISO 8859-8 fonts iso08.*
-# [use: unicode_start iso08.f16 iso08]
-#
 #The MIME name of this charset.
 Miso-8859-8
 
 #Name as a Display Charset (used on Options screen).
 OISO 8859-8 Hebrew
 
-0x20-0x7e	idem
-#0x7f		U+2302
 #
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
+#	Name:             ISO 8859-8 (1988) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-8 (1988) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-8 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
 #
-0xa0	U+00a0
-0xa2-0xa9	idem
-0xaa	U+00d7
-0xab-0xae	idem
-0xaf	U+203e
-0xb0-0xb9	idem
-0xba	U+00f7
-0xbb-0xbe	idem
-0xbf	U+051f
-0xdf	U+2017
-0xe0	U+05d0
-0xe1	U+05d1
-0xe2	U+05d2
-0xe3	U+05d3
-0xe4	U+05d4
-0xe5	U+05d5
-0xe6	U+05d6
-0xe7	U+05d7
-0xe8	U+05d8
-0xe9	U+05d9
-0xea	U+05da
-0xeb	U+05db
-0xec	U+05dc
-0xed	U+05dd
-0xee	U+05de
-0xef	U+05df
-0xf0	U+05e0
-0xf1	U+05e1
-0xf2	U+05e2
-0xf3	U+05e3
-0xf4	U+05e4
-0xf5	U+05e5
-0xf6	U+05e6
-0xf7	U+05e7
-0xf8	U+05e8
-0xf9	U+05e9
-0xfa	U+05ea
+#	The entries are in ISO 8859-8 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
+#
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA2	U+00A2	#	CENT SIGN
+0xA3	U+00A3	#	POUND SIGN
+0xA4	U+00A4	#	CURRENCY SIGN
+0xA5	U+00A5	#	YEN SIGN
+0xA6	U+00A6	#	BROKEN BAR
+0xA7	U+00A7	#	SECTION SIGN
+0xA8	U+00A8	#	DIAERESIS
+0xA9	U+00A9	#	COPYRIGHT SIGN
+0xAA	U+00D7	#	MULTIPLICATION SIGN
+0xAB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	U+00AC	#	NOT SIGN
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAE	U+00AE	#	REGISTERED SIGN
+0xAF	U+203E	#	OVERLINE
+0xB0	U+00B0	#	DEGREE SIGN
+0xB1	U+00B1	#	PLUS-MINUS SIGN
+0xB2	U+00B2	#	SUPERSCRIPT TWO
+0xB3	U+00B3	#	SUPERSCRIPT THREE
+0xB4	U+00B4	#	ACUTE ACCENT
+0xB5	U+00B5	#	MICRO SIGN
+0xB6	U+00B6	#	PILCROW SIGN
+0xB7	U+00B7	#	MIDDLE DOT
+0xB8	U+00B8	#	CEDILLA
+0xB9	U+00B9	#	SUPERSCRIPT ONE
+0xBA	U+00F7	#	DIVISION SIGN
+0xBB	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	U+00BC	#	VULGAR FRACTION ONE QUARTER
+0xBD	U+00BD	#	VULGAR FRACTION ONE HALF
+0xBE	U+00BE	#	VULGAR FRACTION THREE QUARTERS
+0xDF	U+2017	#	DOUBLE LOW LINE
+0xE0	U+05D0	#	HEBREW LETTER ALEF
+0xE1	U+05D1	#	HEBREW LETTER BET
+0xE2	U+05D2	#	HEBREW LETTER GIMEL
+0xE3	U+05D3	#	HEBREW LETTER DALET
+0xE4	U+05D4	#	HEBREW LETTER HE
+0xE5	U+05D5	#	HEBREW LETTER VAV
+0xE6	U+05D6	#	HEBREW LETTER ZAYIN
+0xE7	U+05D7	#	HEBREW LETTER HET
+0xE8	U+05D8	#	HEBREW LETTER TET
+0xE9	U+05D9	#	HEBREW LETTER YOD
+0xEA	U+05DA	#	HEBREW LETTER FINAL KAF
+0xEB	U+05DB	#	HEBREW LETTER KAF
+0xEC	U+05DC	#	HEBREW LETTER LAMED
+0xED	U+05DD	#	HEBREW LETTER FINAL MEM
+0xEE	U+05DE	#	HEBREW LETTER MEM
+0xEF	U+05DF	#	HEBREW LETTER FINAL NUN
+0xF0	U+05E0	#	HEBREW LETTER NUN
+0xF1	U+05E1	#	HEBREW LETTER SAMEKH
+0xF2	U+05E2	#	HEBREW LETTER AYIN
+0xF3	U+05E3	#	HEBREW LETTER FINAL PE
+0xF4	U+05E4	#	HEBREW LETTER PE
+0xF5	U+05E5	#	HEBREW LETTER FINAL TSADI
+0xF6	U+05E6	#	HEBREW LETTER TSADI
+0xF7	U+05E7	#	HEBREW LETTER QOF
+0xF8	U+05E8	#	HEBREW LETTER RESH
+0xF9	U+05E9	#	HEBREW LETTER SHIN
+0xFA	U+05EA	#	HEBREW LETTER TAV
+
 
 #Hebrew points - map to empty string
 U+05B0-U+05C2:
@@ -96,15 +210,3 @@ U+05F1 "\351\345"
 #HEBREW LETTER DOUBLE YOD	#U+05F2:יי
 U+05F2 "\351\351"
 
-
-# TRADE MARK SIGN:
-U+2122:(TM)
-
-0x60    U+2018          # left single quotation mark <`>
-0x27    U+2019-U+201b   # various single quotation marks <'>
-0x22    U+201c-U+201f   # various double quotation marks <">
-
-# Let's try to show a question mark for character that cannot
-# be shown.  U+fffd is used for invalid characters.
-# It works, but let's stick with UHHH representatiion. - FM
-#U+fffd:?
diff --git a/src/chrtrans/iso09_uni.tbl b/src/chrtrans/iso09_uni.tbl
index 8bcb7660..1b204835 100644
--- a/src/chrtrans/iso09_uni.tbl
+++ b/src/chrtrans/iso09_uni.tbl
@@ -1,63 +1,239 @@
-#
-# Unicode mapping table for ISO 8859-9 fonts iso09.*
-# [use: unicode_start iso09.f16 iso09]
-#
 #The MIME name of this charset. 
 Miso-8859-9
 
 #Name as a Display Charset (used on Options screen)
 OISO 8859-9 (Latin 5)
  
-0x20-0x7e	idem
-#0x7f		U+2302
-0xa0-0xcf	idem
-0xd0	U+011e
-0xd1-0xdc	idem
-0xdd	U+0130
-0xde	U+015e
-0xdf-0xef	idem
-0xf0	U+011f
-0xf1-0xfc	idem
-0xfd	U+0131
-0xfe	U+015f
-0xff	U+00ff
-#
-#0x00	U+fffd
-#0x01	U+263A
-#0x02	U+263B
-#0x03	U+2665
-#0x04	U+2666
-#0x05	U+2663
-#0x06	U+2660
-#0x07	U+2022
-#0x08	U+25D8
-#0x09	U+25CB
-#0x0A	U+25D9
-#0x0B	U+2642
-#0x0C	U+2640
-#0x0D	U+266A
-#0x0E	U+266B
-#0x0E	U+266C
-#0x0F	U+263C
-#0x10	U+25B6
-#0x10	U+25BA
-#0x11	U+25C0
-#0x11	U+25C4
-#0x12	U+2195
-#0x13	U+203C
-#0x14	U+00B6
-#0x15	U+00A7
-#0x16	U+25AC
-#0x17	U+21A8
-#0x18	U+2191
-#0x19	U+2193
-#0x1A	U+2192
-#0x1B	U+2190
-#0x1C	U+221F
-#0x1C	U+2319
-#0x1D	U+2194
-#0x1E	U+25B2
-#0x1F	U+25BC
+#
+#	Name:             ISO 8859-9 (1989) to Unicode
+#	Unicode version:  1.1
+#	Table version:    0.1
+#	Table format:     Format A
+#	Date:             16 January 1995
+#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
+#                     John H. Jenkins <John_Jenkins@taligent.com>
+#
+#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO 8859-9 (1989) characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO 8859-9 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO 8859-9 order
+#
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#
+0x20-0x7e idem
+#
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+00A1	#	INVERTED EXCLAMATION MARK
+0xA2	U+00A2	#	CENT SIGN
+0xA3	U+00A3	#	POUND SIGN
+0xA4	U+00A4	#	CURRENCY SIGN
+0xA5	U+00A5	#	YEN SIGN
+0xA6	U+00A6	#	BROKEN BAR
+0xA7	U+00A7	#	SECTION SIGN
+0xA8	U+00A8	#	DIAERESIS
+0xA9	U+00A9	#	COPYRIGHT SIGN
+0xAA	U+00AA	#	FEMININE ORDINAL INDICATOR
+0xAB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	U+00AC	#	NOT SIGN
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAE	U+00AE	#	REGISTERED SIGN
+0xAF	U+00AF	#	MACRON
+0xB0	U+00B0	#	DEGREE SIGN
+0xB1	U+00B1	#	PLUS-MINUS SIGN
+0xB2	U+00B2	#	SUPERSCRIPT TWO
+0xB3	U+00B3	#	SUPERSCRIPT THREE
+0xB4	U+00B4	#	ACUTE ACCENT
+0xB5	U+00B5	#	MICRO SIGN
+0xB6	U+00B6	#	PILCROW SIGN
+0xB7	U+00B7	#	MIDDLE DOT
+0xB8	U+00B8	#	CEDILLA
+0xB9	U+00B9	#	SUPERSCRIPT ONE
+0xBA	U+00BA	#	MASCULINE ORDINAL INDICATOR
+0xBB	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	U+00BC	#	VULGAR FRACTION ONE QUARTER
+0xBD	U+00BD	#	VULGAR FRACTION ONE HALF
+0xBE	U+00BE	#	VULGAR FRACTION THREE QUARTERS
+0xBF	U+00BF	#	INVERTED QUESTION MARK
+0xC0	U+00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+0xC1	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	U+00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+0xC4	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	U+00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xC6	U+00C6	#	LATIN CAPITAL LETTER AE
+0xC7	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	U+00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+0xC9	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	U+00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xCB	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	U+00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+0xCD	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	U+00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+0xD0	U+011E	#	LATIN CAPITAL LETTER G WITH BREVE
+0xD1	U+00D1	#	LATIN CAPITAL LETTER N WITH TILDE
+0xD2	U+00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+0xD3	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	U+00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xD6	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	U+00D7	#	MULTIPLICATION SIGN
+0xD8	U+00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xD9	U+00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+0xDA	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	U+0130	#	LATIN CAPITAL LETTER I WITH DOT ABOVE
+0xDE	U+015E	#	LATIN CAPITAL LETTER S WITH CEDILLA
+0xDF	U+00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	U+00E0	#	LATIN SMALL LETTER A WITH GRAVE
+0xE1	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	U+00E3	#	LATIN SMALL LETTER A WITH TILDE
+0xE4	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	U+00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xE6	U+00E6	#	LATIN SMALL LETTER AE
+0xE7	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	U+00E8	#	LATIN SMALL LETTER E WITH GRAVE
+0xE9	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	U+00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xEB	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	U+00EC	#	LATIN SMALL LETTER I WITH GRAVE
+0xED	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	U+00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+0xF0	U+011F	#	LATIN SMALL LETTER G WITH BREVE
+0xF1	U+00F1	#	LATIN SMALL LETTER N WITH TILDE
+0xF2	U+00F2	#	LATIN SMALL LETTER O WITH GRAVE
+0xF3	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	U+00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xF6	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	U+00F7	#	DIVISION SIGN
+0xF8	U+00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xF9	U+00F9	#	LATIN SMALL LETTER U WITH GRAVE
+0xFA	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	U+0131	#	LATIN SMALL LETTER DOTLESS I
+0xFE	U+015F	#	LATIN SMALL LETTER S WITH CEDILLA
+0xFF	U+00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
 
-# TRADE MARK SIGN:
-U+2122:(TM)
diff --git a/src/chrtrans/makefile.dos b/src/chrtrans/makefile.dos
index 629f6a2f..6871b87a 100644
--- a/src/chrtrans/makefile.dos
+++ b/src/chrtrans/makefile.dos
@@ -12,7 +12,7 @@
 CFLAGS = $(MCFLAGS)
 
 CC = gcc
-MCFLAGS = -O3 -DEXP_CHARTRANS -DDOSPATH -DNO_TTYTYP \
+MCFLAGS = -O3 -DDOSPATH -DNO_TTYTYP \
 -I../../WWW/library/implement -I../../djgpp/tcplib/include \
 -I../../djgpp/tcplib/include/tcp
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-03-03 06:50:07 +0000