Merge tag 'upstream/2.2.5'

Upstream version 2.2.5

22 files changed, 826 insertions, 143 deletions

diff --git a/CHANGES b/CHANGES
index 0566d6c..4f2d6e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,28 @@
+Changes in FIGlet 2.2.5
+-----------------------
+
+FIGlet 2.2.5 is a revision of FIGlet 2.2.4 containing updated andproperly
+licensed ISO8859 map files.  The full list of changes is:
+
+o	Add regression tests for uskata and jis0201 control files
+
+o	Properly escape minus signs in figlist(6) man page (Jonathan
+	McCrohan)
+
+o	Fix chkfont coredump on invalid input (Kenneth Davies and
+	Jonathan McCrohan)
+
+o	Update ISO8859 map files to fix licensing issue raised in Debian
+	bugs 673096 and 674844
+
+o	Re-add missing figmagic and getopt.c files which were left out
+	of releases 2.2.3 and 2.2.4
+
+o	Fix output of test script in MacOS X
+
+These changes were made by Claudio Matsuoka <cmatsuoka@gmail.com>
+31 May 2012
+
 Changes in FIGlet 2.2.4
 -----------------------
 
diff --git a/FAQ b/FAQ
index 0f7cc0c..8e8ca43 100644
--- a/FAQ
+++ b/FAQ
@@ -5,7 +5,7 @@
   info@figlet.org        http://www.figlet.org/   |__|   [FIGlet FAQ v0.91]
 
 ===========================================================================
-The latest version of FIGlet is 2.2.4 and can be downloaded from
+The latest version of FIGlet is 2.2.5 and can be downloaded from
 ftp://ftp.figlet.org/pub/figlet/program
 ===========================================================================
 
diff --git a/Makefile b/Makefile
index 964235b..5a51d51 100644
--- a/Makefile
+++ b/Makefile
@@ -52,14 +52,14 @@ DEFAULTFONTFILE = standard
 ##  END OF CONFIGURATION SECTION
 ##
 
-VERSION	= 2.2.4
+VERSION	= 2.2.5
 DIST	= figlet-$(VERSION)
 OBJS	= figlet.o zipio.o crc.o inflate.o utf8.o
 BINS	= figlet chkfont figlist showfigfonts
 MANUAL	= figlet.6 chkfont.6 figlist.6 showfigfonts.6
-DFILES	= Makefile Makefile.tc $(MANUAL) $(OBJS:.o=.c) chkfont.c \
+DFILES	= Makefile Makefile.tc $(MANUAL) $(OBJS:.o=.c) chkfont.c getopt.c \
 	  figlist showfigfonts CHANGES FAQ README LICENSE figfont.txt \
-	  crc.h inflate.h zipio.h utf8.h run-tests.sh
+	  crc.h inflate.h zipio.h utf8.h run-tests.sh figmagic
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(XCFLAGS) -DDEFAULTFONTDIR=\"$(DEFAULTFONTDIR)\" \
diff --git a/README b/README
index 44c11b6..f6f2c75 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-About FIGlet (Frank, Ian & Glenn's Letters) release 2.2.4, 26 January 2011
+About FIGlet (Frank, Ian & Glenn's Letters) release 2.2.5, 31 May 2012
 --------------------------------------------------------------------------
 FIGlet is a program that creates large characters out of ordinary
 screen characters
diff --git a/chkfont.6 b/chkfont.6
index 44f16f6..681d6ad 100644
--- a/chkfont.6
+++ b/chkfont.6
@@ -12,7 +12,7 @@
 .\"
 .\" Manual page by Jonathon Abbott, for the Debian Project
 .\" slightly modified by Francesco Tapparo, for the Debian Project
-.TH CHKFONT 6 "26 January 2011" "v2.2.4"
+.TH CHKFONT 6 "31 May 2012" "v2.2.5"
 
 .SH NAME
 chkfont \- checks figlet 2.0 and up font files for format errors
diff --git a/chkfont.c b/chkfont.c
index 92fefad..63bf381 100644
--- a/chkfont.c
+++ b/chkfont.c
@@ -272,6 +272,7 @@ numsread=sscanf(fileline,"%c %d %d %d %d %d %d %d %d",
   &hardblank,&charheight,&upheight,&maxlen,&old_layout,&cmtcount,
   &ffrighttoleft,&layout,&spectagcnt);
 free(fileline);
+fileline = NULL;
 if (numsread<7) {
   ffrighttoleft=0;
   }
diff --git a/figlet.6 b/figlet.6
index 1663134..ff22311 100644
--- a/figlet.6
+++ b/figlet.6
@@ -3,13 +3,13 @@
 .\"  Internet: <info@figlet.org>
 .\"  Portions Copyright 1996, 1997, 1998, 1999, 2000, 2001 by John Cowan <cowan@ccil.org>
 .\"  Portions Copyright 2002 by Christiaan Keet
-.\"  Portions Copyright 2011 by Claudio Matsuoka
+.\"  Portions Copyright 2011, 2012 by Claudio Matsuoka
 .\"  FIGlet, along with the various FIGlet fonts and documentation, may
 .\"  be freely copied and distributed.
 .\"  If you use FIGlet, please send an e-mail message to
 .\"  <info@figlet.org>
 .\"
-.TH FIGLET 6 "26 January 2011" "v2.2.4"
+.TH FIGLET 6 "31 May 2012" "v2.2.5"
 
 .SH NAME
 FIGlet \- display large characters made up of ordinary screen characters
diff --git a/figlet.c b/figlet.c
index e53f36c..3de795a 100644
--- a/figlet.c
+++ b/figlet.c
@@ -3,7 +3,7 @@
   FIGlet Copyright 1991, 1993, 1994 Glenn Chappell and Ian Chai
   FIGlet Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan
   FIGlet Copyright 2002 Christiaan Keet
-  FIGlet Copyright 2011 Claudio Matsuoka
+  FIGlet Copyright 2011, 2012 Claudio Matsuoka
   Portions written by Paul Burton and Christiaan Keet
   Internet: <info@figlet.org>
   FIGlet, along with the various FIGlet fonts and documentation, is
@@ -11,9 +11,9 @@
     (as listed in the file "LICENSE" which is included in this package)
 ****************************************************************************/
 
-#define DATE "26 January 2011"
-#define VERSION "2.2.4"
-#define VERSION_INT 20204
+#define DATE "31 May 2012"
+#define VERSION "2.2.5"
+#define VERSION_INT 20205
 
 /* FIGlet (Frank, Ian & Glenn's Letters) */
 /* by Glenn Chappell */
@@ -39,6 +39,7 @@
    to "Academic Free License" as agreed by FIGlet authors. 05 July 2005 */
 /* Release 2.2.3 by Claudio Matsuoka, 12 Jan 2011: BSD license, fixes */
 /* Release 2.2.4 by Claudio Matsuoka, 26 Jan 2011: tlf2 font support */
+/* Release 2.2.5 by Claudio Matsuoka, 31 May 2012: flc licensing, minor fixes */
 
 /*---------------------------------------------------------------------------
   DEFAULTFONTDIR and DEFAULTFONTFILE should be defined in the Makefile.
@@ -431,7 +432,7 @@ int infonum;
 {
   switch (infonum) {
     case 0: /* Copyright message */
-      printf("FIGlet Copyright (C) 1991-2011 Glenn Chappell, Ian Chai, ");
+      printf("FIGlet Copyright (C) 1991-2012 Glenn Chappell, Ian Chai, ");
       printf("John Cowan,\nChristiaan Keet and Claudio Matsuoka\n");
       printf("Internet: <info@figlet.org> ");
       printf("Version: %s, date: %s\n\n",VERSION,DATE);
diff --git a/figlist.6 b/figlist.6
index 15586bc..c8b7cae 100644
--- a/figlist.6
+++ b/figlist.6
@@ -8,7 +8,7 @@
 .\"
 .\" Manual page by Jonathon Abbott, for the Debian Project
 .\" slightly modified by Francesco Tapparo, for the Debian Project
-.TH FIGLIST 6 "26 January 2011" "v2.2.4"
+.TH FIGLIST 6 "31 May 2012" "v2.2.5"
 
 .SH NAME
 figlist \- lists figlet fonts and control files
@@ -22,7 +22,7 @@ figlist \- lists figlet fonts and control files
 
 .SH DESCRIPTION
 Lists all fonts and control files in figlet's default font directory.
-Replaces "figlet -F", which was removed from figlet version 2.1.
+Replaces "figlet \-F", which was removed from figlet version 2.1.
 
 .SH EXAMPLES
 To use
@@ -37,7 +37,7 @@ with its default settings, simply type
 To list all the font and control files in /usr/share/fonts/figlet
 .RS
 
-.B example% figlist -d /usr/share/fonts/figlet
+.B example% figlist \-d /usr/share/fonts/figlet
 
 .RE
 
diff --git a/figmagic b/figmagic
new file mode 100644
index 0000000..5e9a01a
--- /dev/null
+++ b/figmagic
@@ -0,0 +1,6 @@
+# Append this file to your /etc/magic or /usr/share/misc/magic file
+# to enable the ``file'' command to report on FIGlet fonts and controlfiles.
+0	string		flf		FIGlet font
+>3	string		>2a		version %-2.2s
+0	string		flc		FIGlet controlfile
+>3	string		>2a		version %-2.2s
diff --git a/fonts/8859-2.flc b/fonts/8859-2.flc
index e6f4fb0..e45df25 100644
--- a/fonts/8859-2.flc
+++ b/fonts/8859-2.flc
@@ -1,42 +1,82 @@
 #
-#	Name:             ISO 8859-2 (1987) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
+#	Name:             ISO 8859-2:1999 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
 #	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-1999 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
+#	file has been provided on optical 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.
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
 #
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-2 (1987) characters map into Unicode.
+#       ISO/IEC 8859-2:1999 characters map into Unicode.
 #
 #	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-2 code (in hex as 0xXX)
+#		 Column #1 is the ISO/IEC 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
+#	The entries are in ISO/IEC 8859-2 order.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
 #
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
 0x20	0x0020	#	SPACE
 0x21	0x0021	#	EXCLAMATION MARK
 0x22	0x0022	#	QUOTATION MARK
@@ -132,6 +172,39 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
 0xA0	0x00A0	#	NO-BREAK SPACE
 0xA1	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
 0xA2	0x02D8	#	BREVE
diff --git a/fonts/8859-3.flc b/fonts/8859-3.flc
index 9986688..9b6ac69 100644
--- a/fonts/8859-3.flc
+++ b/fonts/8859-3.flc
@@ -1,42 +1,82 @@
 #
-#	Name:             ISO 8859-3 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
+#	Name:             ISO/IEC 8859-3:1999 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
 #	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-1999 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
+#	file has been provided on optical 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.
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
 #
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-3 (1988) characters map into Unicode.
+#       ISO/IEC 8859-3:1999 characters map into Unicode.
 #
 #	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-3 code (in hex as 0xXX)
+#		 Column #1 is the ISO/IEC 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
+#	The entries are in ISO/IEC 8859-3 order.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
 #
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
 0x20	0x0020	#	SPACE
 0x21	0x0021	#	EXCLAMATION MARK
 0x22	0x0022	#	QUOTATION MARK
@@ -132,6 +172,39 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
 0xA0	0x00A0	#	NO-BREAK SPACE
 0xA1	0x0126	#	LATIN CAPITAL LETTER H WITH STROKE
 0xA2	0x02D8	#	BREVE
diff --git a/fonts/8859-4.flc b/fonts/8859-4.flc
index c686a39..662e698 100644
--- a/fonts/8859-4.flc
+++ b/fonts/8859-4.flc
@@ -1,42 +1,82 @@
 #
-#	Name:             ISO 8859-4 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
+#	Name:             ISO/IEC 8859-4:1998 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
 #	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-1999 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
+#	file has been provided on optical 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.
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
 #
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-4 (1988) characters map into Unicode.
+#       ISO/IEC 8859-4:1998 characters map into Unicode.
 #
 #	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-4 code (in hex as 0xXX)
+#		 Column #1 is the ISO/IEC 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
+#	The entries are in ISO/IEC 8859-4 order.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
 #
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
 0x20	0x0020	#	SPACE
 0x21	0x0021	#	EXCLAMATION MARK
 0x22	0x0022	#	QUOTATION MARK
@@ -132,6 +172,39 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
 0xA0	0x00A0	#	NO-BREAK SPACE
 0xA1	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
 0xA2	0x0138	#	LATIN SMALL LETTER KRA
diff --git a/fonts/8859-5.flc b/fonts/8859-5.flc
index ae7a76e..a7ed1ce 100644
--- a/fonts/8859-5.flc
+++ b/fonts/8859-5.flc
@@ -1,42 +1,82 @@
 #
-#	Name:             ISO 8859-5 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
+#	Name:             ISO 8859-5:1999 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
 #	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-1999 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
+#	file has been provided on optical 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.
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
 #
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-5 (1988) characters map into Unicode.
+#       ISO/IEC 8859-5:1999 characters map into Unicode.
 #
 #	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-5 code (in hex as 0xXX)
+#		 Column #1 is the ISO/IEC 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
+#	The entries are in ISO/IEC 8859-5 order.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
 #
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
 0x20	0x0020	#	SPACE
 0x21	0x0021	#	EXCLAMATION MARK
 0x22	0x0022	#	QUOTATION MARK
@@ -132,6 +172,39 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
 0xA0	0x00A0	#	NO-BREAK SPACE
 0xA1	0x0401	#	CYRILLIC CAPITAL LETTER IO
 0xA2	0x0402	#	CYRILLIC CAPITAL LETTER DJE
diff --git a/fonts/8859-7.flc b/fonts/8859-7.flc
index f9ea851..bc46b74 100644
--- a/fonts/8859-7.flc
+++ b/fonts/8859-7.flc
@@ -1,42 +1,90 @@
 #
-#	Name:             ISO 8859-7 (1987) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
+#	Name:             ISO 8859-7:2003 to Unicode
+#	Unicode version:  4.0
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
+#	Date:             2003-Nov-12
+#	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-2003 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
+#	file has been provided on optical 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.
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
 #
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-7 (1987) characters map into Unicode.
+#       ISO 8859-7:2003 characters map into Unicode.
+#
+#	ISO 8859-7:1987 is equivalent to ISO-IR-126, ELOT 928,
+#	and ECMA 118. ISO 8859-7:2003 adds two currency signs 
+#	and one other character not in the earlier standard.
 #
 #	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
+#	The entries are in ISO 8859-7 order.
+#
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
+#	Remap 0xA1 to U+2018 (instead of 0x02BD) to match text of 8859-7
+#	Remap 0xA2 to U+2019 (instead of 0x02BC) to match text of 8859-7
+#
+#	2.0 version updates 1.0 version by adding mappings for the
+#	three newly added characters 0xA4, 0xA5, 0xAA.
+#
+#	Updated versions of this file may be found in:
+#		<http://www.unicode.org/Public/MAPPINGS/>
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#	Any comments or problems, contact the Unicode Consortium at:
+#	        <http://www.unicode.org/reporting.html>
 #
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
 0x20	0x0020	#	SPACE
 0x21	0x0021	#	EXCLAMATION MARK
 0x22	0x0022	#	QUOTATION MARK
@@ -132,14 +180,50 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
 0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x02BD	#	MODIFIER LETTER REVERSED COMMA
-0xA2	0x02BC	#	MODIFIER LETTER APOSTROPHE
+0xA1	0x2018	#	LEFT SINGLE QUOTATION MARK
+0xA2	0x2019	#	RIGHT SINGLE QUOTATION MARK
 0xA3	0x00A3	#	POUND SIGN
+0xA4	0x20AC	#	EURO SIGN
+0xA5	0x20AF	#	DRACHMA SIGN
 0xA6	0x00A6	#	BROKEN BAR
 0xA7	0x00A7	#	SECTION SIGN
 0xA8	0x00A8	#	DIAERESIS
 0xA9	0x00A9	#	COPYRIGHT SIGN
+0xAA	0x037A	#	GREEK YPOGEGRAMMENI
 0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 0xAC	0x00AC	#	NOT SIGN
 0xAD	0x00AD	#	SOFT HYPHEN
diff --git a/fonts/8859-8.flc b/fonts/8859-8.flc
index 347f567..bc8da4c 100644
--- a/fonts/8859-8.flc
+++ b/fonts/8859-8.flc
@@ -1,42 +1,84 @@
 #
-#	Name:             ISO 8859-8 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
+#	Name:             ISO/IEC 8859-8:1999 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.1
 #	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
+#	Date:             2000-Jan-03
+#	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-1999 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
+#	file has been provided on optical 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.
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
 #
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-8 (1988) characters map into Unicode.
+#       ISO/IEC 8859-8:1999 characters map into Unicode.
 #
 #	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-8 code (in hex as 0xXX)
+#		 Column #1 is the ISO/IEC 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, '#')
 #
-#	The entries are in ISO 8859-8 order
+#	The entries are in ISO/IEC 8859-8 order.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
+#       1.1 version updates to the published 8859-8:1999, correcting
+#          the mapping of 0xAF and adding mappings for LRM and RLM.
 #
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
 0x20	0x0020	#	SPACE
 0x21	0x0021	#	EXCLAMATION MARK
 0x22	0x0022	#	QUOTATION MARK
@@ -132,6 +174,39 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
 0xA0	0x00A0	#	NO-BREAK SPACE
 0xA2	0x00A2	#	CENT SIGN
 0xA3	0x00A3	#	POUND SIGN
@@ -146,7 +221,7 @@
 0xAC	0x00AC	#	NOT SIGN
 0xAD	0x00AD	#	SOFT HYPHEN
 0xAE	0x00AE	#	REGISTERED SIGN
-0xAF	0x203E	#	OVERLINE
+0xAF	0x00AF	#	MACRON
 0xB0	0x00B0	#	DEGREE SIGN
 0xB1	0x00B1	#	PLUS-MINUS SIGN
 0xB2	0x00B2	#	SUPERSCRIPT TWO
@@ -190,3 +265,6 @@
 0xF8	0x05E8	#	HEBREW LETTER RESH
 0xF9	0x05E9	#	HEBREW LETTER SHIN
 0xFA	0x05EA	#	HEBREW LETTER TAV
+0xFD	0x200E	#	LEFT-TO-RIGHT MARK
+0xFE	0x200F	#	RIGHT-TO-LEFT MARK
+
diff --git a/fonts/8859-9.flc b/fonts/8859-9.flc
index 7a065c6..22901f1 100644
--- a/fonts/8859-9.flc
+++ b/fonts/8859-9.flc
@@ -1,13 +1,12 @@
 #
-#	Name:             ISO 8859-9 (1989) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
+#	Name:             ISO/IEC 8859-9:1999 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
 #	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-1999 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
@@ -17,26 +16,69 @@
 #	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.
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
 #
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-9 (1989) characters map into Unicode.
+#       ISO/IEC 8859-9:1999 characters map into Unicode.
 #
 #	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-9 code (in hex as 0xXX)
+#		 Column #1 is the ISO/IEC 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
+#	The entries are in ISO/IEC 8859-9 order.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#	ISO/IEC 8859-9 is also equivalent to ISO-IR-148.
 #
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
 0x20	0x0020	#	SPACE
 0x21	0x0021	#	EXCLAMATION MARK
 0x22	0x0022	#	QUOTATION MARK
@@ -132,6 +174,39 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
 0xA0	0x00A0	#	NO-BREAK SPACE
 0xA1	0x00A1	#	INVERTED EXCLAMATION MARK
 0xA2	0x00A2	#	CENT SIGN
diff --git a/getopt.c b/getopt.c
new file mode 100644
index 0000000..4218991
--- /dev/null
+++ b/getopt.c
@@ -0,0 +1,104 @@
+/*
+ * *    @(#)getopt.c    2.3 (smail) 5/30/87 
+ */
+
+/*
+ * Here's something you've all been waiting for:  the AT&T public domain
+ * source for getopt(3).  It is the code which was given out at the 1985
+ * UNIFORUM conference in Dallas. I obtained it by electronic mail directly
+ * from AT&T.  The people there assure me that it is indeed in the public
+ * domain. 
+ *
+ * There is no manual page. That is because the one they gave out at UNIFORUM
+ * was slightly different from the current System V Release 2 manual page. 
+ * The difference apparently involved a note about the famous rules 5 and 6,
+ * recommending using white space between an option and its first argument,
+ * and not grouping options that have arguments. Getopt itself is currently
+ * lenient about both of these things White space is allowed, but not
+ * mandatory, and the last option in a group can have an argument.  That
+ * particular version of the man page evidently has no official existence,
+ * and my source at AT&T did not send a copy. The current SVR2 man page
+ * reflects the actual behavior of this getopt. However, I am not about to
+ * post a copy of anything licensed by AT&T. 
+ */
+
+#ifdef BSD
+ #include <strings.h>
+#else
+ #define index strchr
+ #include <string.h>
+#endif
+
+/* LINTLIBRARY */
+#ifndef NULL
+#define NULL    0
+#endif
+
+#define EOF    (-1)
+#define ERR(s, c)    if(opterr){\
+    extern int write(int, void *, unsigned);\
+    char errbuf[2];\
+    errbuf[0] = (char)c; errbuf[1] = '\n';\
+    (void) write(2, strlwr(argv[0]), (unsigned)strlen(argv[0]));\
+    (void) write(2, s, (unsigned)strlen(s));\
+    (void) write(2, errbuf, 2);}
+
+extern char    *index();
+
+int             opterr = 1;
+int             optind = 1;
+int             optopt;
+char           *optarg;
+
+int getopt(int argc, char *argv[], char *opts)
+{
+      static int      sp = 1;
+      register int    c;
+      register char  *cp;
+
+      if (sp == 1)
+      {
+            if (optind >= argc || argv[optind][0] != '-' ||
+                  argv[optind][1] == '\0')
+                        return (EOF);
+            else if (strcmp(argv[optind], "--") == 0)
+            {
+                  optind++;
+                  return (EOF);
+            }
+      }
+      optopt = c = argv[optind][sp];
+      if (c == ':' || (cp = index(opts, c)) == NULL)
+      {
+            ERR(": illegal option -- ", c);
+            if (argv[optind][++sp] == '\0')
+            {
+                  optind++;
+                  sp = 1;
+            }
+            return ('?');
+      }
+      if (*++cp == ':')
+      {
+            if (argv[optind][sp + 1] != '\0')
+                  optarg = &argv[optind++][sp + 1];
+            else if (++optind >= argc)
+            {
+                  ERR(": option requires an argument -- ", c);
+                  sp = 1;
+                  return ('?');
+            }
+            else  optarg = argv[optind++];
+            sp = 1;
+      }
+      else
+      {
+            if (argv[optind][++sp] == '\0')
+            {
+                  sp = 1;
+                  optind++;
+            }
+            optarg = NULL;
+      }
+      return (c);
+}
diff --git a/run-tests.sh b/run-tests.sh
index 7e33405..26d2581 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -15,7 +15,7 @@ run_test() {
 	test_cmd=$3
 
 	echo >> $LOGFILE
-	echo -n "Run test $test_num: ${test_dsc}... " | tee -a $LOGFILE
+	printf "Run test $test_num: ${test_dsc}... " | tee -a $LOGFILE
 	echo >> $LOGFILE
 	echo "Command: $test_cmd" >> $LOGFILE
 	eval "$test_cmd" > "$OUTPUT" 2>> $LOGFILE
@@ -32,19 +32,18 @@ run_test() {
 result=0
 fail=0
 $CMD -v > $LOGFILE
-$CMD -f small "Test results" | tee -a $LOGFILE
 
 file="$TESTDIR/input.txt"
 cmd="cat $file|$CMD"
 
-echo -n "Default font dir: "; $CMD -I2
+printf "Default font dir: "; $CMD -I2
 if [ -n "$FONTDIR" ]; then
 	FIGLET_FONTDIR="$FONTDIR"
 	export FIGLET_FONTDIR
 fi
-echo -n "Current font dir: "; $CMD -I2
-echo -n "Default font: "; $CMD -I3
-echo
+printf "Current font dir: "; $CMD -I2
+printf "Default font: "; $CMD -I3
+$CMD -f small "Test results" | tee -a $LOGFILE
 
 run_test 001 "showfigfonts output" "./showfigfonts"
 run_test 002 "text rendering in all fonts" \
@@ -73,6 +72,8 @@ run_test 021 "paragraph mode long line output" "$cmd -p -w250"
 run_test 022 "short line output" "$cmd -w5"
 run_test 023 "kerning paragraph centered mode (small)" "$cmd -kpc -fsmall"
 run_test 024 "list of control files" "ls fonts/*flc"
+run_test 025 "uskata control file" "printf 'ABCDE'|$CMD -fbanner -Cuskata"
+run_test 026 "jis0201 control file" "printf '\261\262\263\264\265'|$CMD -fbanner -Cjis0201"
 
 rm -f "$OUTPUT"
 
diff --git a/showfigfonts.6 b/showfigfonts.6
index a4eee79..0ec5783 100644
--- a/showfigfonts.6
+++ b/showfigfonts.6
@@ -11,7 +11,7 @@
 .\"
 .\" Manual page by Jonathon Abbott, for the Debian Project
 .\" slightly modified by Francesco Tapparo, for the Debian Project
-.TH SHOWFIGFONTS 6 "26 January 2011" "v2.2.4"
+.TH SHOWFIGFONTS 6 "31 May 2012" "v2.2.5"
 
 .SH NAME
 showfigfonts \- prints a list of available figlet fonts
diff --git a/tests/res025.txt b/tests/res025.txt
new file mode 100644
index 0000000..12b3f95
--- /dev/null
+++ b/tests/res025.txt
@@ -0,0 +1,8 @@
+##########       ##     #                        #   
+      ###      ##   ##########   #######  ########## 
+     #       ## #   #        #      #           ##   
+    #      ##   #          ##       #         ## #   
+   #            #        ##         #       ##   #   
+  #             #      ##           #     ##    ##   
+ #              #    ##        ##########        #   
+                                                     
diff --git a/tests/res026.txt b/tests/res026.txt
new file mode 100644
index 0000000..12b3f95
--- /dev/null
+++ b/tests/res026.txt
@@ -0,0 +1,8 @@
+##########       ##     #                        #   
+      ###      ##   ##########   #######  ########## 
+     #       ## #   #        #      #           ##   
+    #      ##   #          ##       #         ## #   
+   #            #        ##         #       ##   #   
+  #             #      ##           #     ##    ##   
+ #              #    ##        ##########        #   
+