r26878 - in /packages/unstable/gmime2.4: ./ build/vs2008/ docs/reference/ docs/reference/html/ docs/reference/xml/ docs/tutorial/ examples/ gmime/ src/ tests/ util/

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Mon Mar 14 20:31:29 UTC 2011


Author: meebey
Date: Mon Mar 14 20:31:22 2011
New Revision: 26878

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26878
Log:
Merge commit 'upstream/2.4.23'

Modified:
    packages/unstable/gmime2.4/ChangeLog
    packages/unstable/gmime2.4/INSTALL
    packages/unstable/gmime2.4/README
    packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
    packages/unstable/gmime2.4/config.h.in
    packages/unstable/gmime2.4/configure
    packages/unstable/gmime2.4/configure.in
    packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml
    packages/unstable/gmime2.4/docs/reference/html/MimeParts.html
    packages/unstable/gmime2.4/docs/reference/html/ch01.html
    packages/unstable/gmime2.4/docs/reference/html/classes.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-charset.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-content-type.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-data-wrapper.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-disposition.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-basic.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-charset.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-crlf.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-windows.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-iconv.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-part.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-partial.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-encrypted.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-signed.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-object.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-parser.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-part.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session-simple.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-utils.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address-list.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html
    packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp
    packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2
    packages/unstable/gmime2.4/docs/reference/html/index.html
    packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-data-wrapper.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-encodings.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-encrypted.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-signed.xml
    packages/unstable/gmime2.4/docs/tutorial/gmime-tut.sgml
    packages/unstable/gmime2.4/examples/basic-example.c
    packages/unstable/gmime2.4/examples/imap-example.c
    packages/unstable/gmime2.4/gmime.spec
    packages/unstable/gmime2.4/gmime/Makefile.am
    packages/unstable/gmime2.4/gmime/Makefile.in
    packages/unstable/gmime2.4/gmime/charset-map.c
    packages/unstable/gmime2.4/gmime/gen-table.c
    packages/unstable/gmime2.4/gmime/gmime-charset-map-private.h
    packages/unstable/gmime2.4/gmime/gmime-charset.c
    packages/unstable/gmime2.4/gmime/gmime-charset.h
    packages/unstable/gmime2.4/gmime/gmime-cipher-context.c
    packages/unstable/gmime2.4/gmime/gmime-cipher-context.h
    packages/unstable/gmime2.4/gmime/gmime-common.c
    packages/unstable/gmime2.4/gmime/gmime-common.h
    packages/unstable/gmime2.4/gmime/gmime-content-type.c
    packages/unstable/gmime2.4/gmime/gmime-content-type.h
    packages/unstable/gmime2.4/gmime/gmime-data-wrapper.c
    packages/unstable/gmime2.4/gmime/gmime-data-wrapper.h
    packages/unstable/gmime2.4/gmime/gmime-disposition.c
    packages/unstable/gmime2.4/gmime/gmime-disposition.h
    packages/unstable/gmime2.4/gmime/gmime-encodings.c
    packages/unstable/gmime2.4/gmime/gmime-encodings.h
    packages/unstable/gmime2.4/gmime/gmime-error.h
    packages/unstable/gmime2.4/gmime/gmime-filter-basic.c
    packages/unstable/gmime2.4/gmime/gmime-filter-basic.h
    packages/unstable/gmime2.4/gmime/gmime-filter-best.c
    packages/unstable/gmime2.4/gmime/gmime-filter-best.h
    packages/unstable/gmime2.4/gmime/gmime-filter-charset.c
    packages/unstable/gmime2.4/gmime/gmime-filter-charset.h
    packages/unstable/gmime2.4/gmime/gmime-filter-crlf.c
    packages/unstable/gmime2.4/gmime/gmime-filter-crlf.h
    packages/unstable/gmime2.4/gmime/gmime-filter-enriched.c
    packages/unstable/gmime2.4/gmime/gmime-filter-enriched.h
    packages/unstable/gmime2.4/gmime/gmime-filter-from.c
    packages/unstable/gmime2.4/gmime/gmime-filter-from.h
    packages/unstable/gmime2.4/gmime/gmime-filter-gzip.c
    packages/unstable/gmime2.4/gmime/gmime-filter-gzip.h
    packages/unstable/gmime2.4/gmime/gmime-filter-html.c
    packages/unstable/gmime2.4/gmime/gmime-filter-html.h
    packages/unstable/gmime2.4/gmime/gmime-filter-md5.c
    packages/unstable/gmime2.4/gmime/gmime-filter-md5.h
    packages/unstable/gmime2.4/gmime/gmime-filter-strip.c
    packages/unstable/gmime2.4/gmime/gmime-filter-strip.h
    packages/unstable/gmime2.4/gmime/gmime-filter-windows.c
    packages/unstable/gmime2.4/gmime/gmime-filter-windows.h
    packages/unstable/gmime2.4/gmime/gmime-filter-yenc.c
    packages/unstable/gmime2.4/gmime/gmime-filter-yenc.h
    packages/unstable/gmime2.4/gmime/gmime-filter.c
    packages/unstable/gmime2.4/gmime/gmime-filter.h
    packages/unstable/gmime2.4/gmime/gmime-gpg-context.c
    packages/unstable/gmime2.4/gmime/gmime-gpg-context.h
    packages/unstable/gmime2.4/gmime/gmime-header.c
    packages/unstable/gmime2.4/gmime/gmime-header.h
    packages/unstable/gmime2.4/gmime/gmime-iconv-utils.c
    packages/unstable/gmime2.4/gmime/gmime-iconv-utils.h
    packages/unstable/gmime2.4/gmime/gmime-iconv.c
    packages/unstable/gmime2.4/gmime/gmime-iconv.h
    packages/unstable/gmime2.4/gmime/gmime-message-part.c
    packages/unstable/gmime2.4/gmime/gmime-message-part.h
    packages/unstable/gmime2.4/gmime/gmime-message-partial.c
    packages/unstable/gmime2.4/gmime/gmime-message-partial.h
    packages/unstable/gmime2.4/gmime/gmime-message.c
    packages/unstable/gmime2.4/gmime/gmime-message.h
    packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.c
    packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.h
    packages/unstable/gmime2.4/gmime/gmime-multipart-signed.c
    packages/unstable/gmime2.4/gmime/gmime-multipart-signed.h
    packages/unstable/gmime2.4/gmime/gmime-multipart.c
    packages/unstable/gmime2.4/gmime/gmime-multipart.h
    packages/unstable/gmime2.4/gmime/gmime-object.c
    packages/unstable/gmime2.4/gmime/gmime-object.h
    packages/unstable/gmime2.4/gmime/gmime-param.c
    packages/unstable/gmime2.4/gmime/gmime-param.h
    packages/unstable/gmime2.4/gmime/gmime-parse-utils.c
    packages/unstable/gmime2.4/gmime/gmime-parse-utils.h
    packages/unstable/gmime2.4/gmime/gmime-parser.c
    packages/unstable/gmime2.4/gmime/gmime-parser.h
    packages/unstable/gmime2.4/gmime/gmime-part.c
    packages/unstable/gmime2.4/gmime/gmime-part.h
    packages/unstable/gmime2.4/gmime/gmime-session-simple.c
    packages/unstable/gmime2.4/gmime/gmime-session-simple.h
    packages/unstable/gmime2.4/gmime/gmime-session.c
    packages/unstable/gmime2.4/gmime/gmime-session.h
    packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c
    packages/unstable/gmime2.4/gmime/gmime-stream-buffer.h
    packages/unstable/gmime2.4/gmime/gmime-stream-cat.c
    packages/unstable/gmime2.4/gmime/gmime-stream-cat.h
    packages/unstable/gmime2.4/gmime/gmime-stream-file.c
    packages/unstable/gmime2.4/gmime/gmime-stream-file.h
    packages/unstable/gmime2.4/gmime/gmime-stream-filter.c
    packages/unstable/gmime2.4/gmime/gmime-stream-filter.h
    packages/unstable/gmime2.4/gmime/gmime-stream-fs.c
    packages/unstable/gmime2.4/gmime/gmime-stream-fs.h
    packages/unstable/gmime2.4/gmime/gmime-stream-mem.c
    packages/unstable/gmime2.4/gmime/gmime-stream-mem.h
    packages/unstable/gmime2.4/gmime/gmime-stream-mmap.c
    packages/unstable/gmime2.4/gmime/gmime-stream-mmap.h
    packages/unstable/gmime2.4/gmime/gmime-stream-null.c
    packages/unstable/gmime2.4/gmime/gmime-stream-null.h
    packages/unstable/gmime2.4/gmime/gmime-stream.c
    packages/unstable/gmime2.4/gmime/gmime-stream.h
    packages/unstable/gmime2.4/gmime/gmime-utils.c
    packages/unstable/gmime2.4/gmime/gmime-utils.h
    packages/unstable/gmime2.4/gmime/gmime.c
    packages/unstable/gmime2.4/gmime/gmime.h
    packages/unstable/gmime2.4/gmime/internet-address.c
    packages/unstable/gmime2.4/gmime/internet-address.h
    packages/unstable/gmime2.4/iconv-detect.c
    packages/unstable/gmime2.4/src/uudecode.c
    packages/unstable/gmime2.4/src/uuencode.c
    packages/unstable/gmime2.4/tests/Makefile.am
    packages/unstable/gmime2.4/tests/Makefile.in
    packages/unstable/gmime2.4/tests/test-best.c
    packages/unstable/gmime2.4/tests/test-cat.c
    packages/unstable/gmime2.4/tests/test-headers.c
    packages/unstable/gmime2.4/tests/test-html.c
    packages/unstable/gmime2.4/tests/test-iconv.c
    packages/unstable/gmime2.4/tests/test-mbox.c
    packages/unstable/gmime2.4/tests/test-mime.c
    packages/unstable/gmime2.4/tests/test-parser.c
    packages/unstable/gmime2.4/tests/test-partial.c
    packages/unstable/gmime2.4/tests/test-pgp.c
    packages/unstable/gmime2.4/tests/test-pgpmime.c
    packages/unstable/gmime2.4/tests/test-streams.c
    packages/unstable/gmime2.4/tests/testsuite.c
    packages/unstable/gmime2.4/tests/testsuite.h
    packages/unstable/gmime2.4/util/cache.c
    packages/unstable/gmime2.4/util/cache.h
    packages/unstable/gmime2.4/util/gtrie.c
    packages/unstable/gmime2.4/util/gtrie.h
    packages/unstable/gmime2.4/util/list.c
    packages/unstable/gmime2.4/util/list.h
    packages/unstable/gmime2.4/util/url-scanner.c
    packages/unstable/gmime2.4/util/url-scanner.h
    packages/unstable/gmime2.4/zentimer.h

Modified: packages/unstable/gmime2.4/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/ChangeLog?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/ChangeLog [utf-8] (original)
+++ packages/unstable/gmime2.4/ChangeLog [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,3 +1,283 @@
+2011-03-07  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.23
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+	* gmime/gmime-gpg-context.c (gpg_ctx_parse_signer_info): Treat
+	EXPSIG, EXPKEYSIG, and REVKEYSIG the same as GOODSIG/BADSIG status
+	messages in that all of them denote a new signer info.
+
+2011-01-29  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-multipart-encrypted.c (g_mime_multipart_encrypted_decrypt):
+	Fixed documentation. Fixes bug #640906 and bug #640911.
+
+2011-01-25  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.22
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2011-01-22  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-stream-mem.c (stream_write): Correctly calculate the
+	end boundary of the stream when bound_end is -1.
+
+2010-12-05  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.21
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2010-11-29  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/internet-address.c (decode_address): Handle edge cases
+	where inptr reaches the end of the input string prematurely due to
+	a malformed address.
+
+2010-11-21  Jeffrey Stedfast  <fejj at novell.com>
+
+	Fixes bug #635407.
+
+	* gmime/gmime-multipart-encrypted.c (g_mime_multipart_encrypted_decrypt):
+	Updated error messages to be more consistent.
+
+	* gmime/gmime-multipart-signed.c (g_mime_multipart_signed_verify):
+	Make sure to set an error in all cases returning NULL.
+
+2010-11-21  Jeffrey Stedfast  <fejj at novell.com>
+
+	Fixes bug #635405.
+
+	* gmime/gmime-cipher-context.c (g_mime_signer_get_*): These
+	functions all now take a const GMimeSigner *.
+
+2010-11-19  Jeffrey Stedfast  <fejj at novell.com>
+
+	Fixes bug #635152
+
+	* gmime/gmime-gpg-context.c (GpgCtx): No longer has a sigfile
+	member. Instead contains a sigstream and passwd_fd is now renamed
+	to secret_fd and used for both sending gpg the user's passwd as
+	well as for sending gpg the digital signature when verifying.
+	(gpg_ctx_new): Updated for the new struct members.
+	(gpg_ctx_set_sigstream): Replaces gpg_ctx_set_sigfile().
+	(gpg_ctx_free): Updated for the new struct members.
+	(gpg_ctx_get_argv): Modify our --verify command-line so that we
+	can pas gpg the digital signature without first writing it to
+	disk. Also modified to return char** instead of a GPtrArray to
+	simplify things.
+	(gpg_ctx_op_start): Modified to also create more pipes in VERIFY
+	mode.
+	(gpg_ctx_op_step): Modified to stream the digital signature to
+	gpg.
+	(gpg_verify): Don't write the digital signature to disk - instead,
+	we now stream it directly to gpg.
+
+2010-10-13  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.20
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2010-09-25  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/charset-map.c: According to rfc1557, it is suggested that
+	euc-kr be used for headers since many Korean mailers cannot handle
+	base64 or quoted-printable encoded iso-2022-kr. Based on this and
+	bug #629235, I'm just going to drop iso-2022-kr.
+
+2010-09-17  Jeffrey Stedfast  <fejj at novell.com>
+
+	Based on a patch by Marek Łętowski
+
+	* gmime/gmime-utils.c (g_mime_utils_header_decode_text): In the
+	workaround case, if we don't find an end marker, reset our inptr
+	to the beginning of the most recent word *plus 2* (to skip over
+	the leading "=?"), not the beginning of the input text. Also need
+	to reset our ascii state.
+	(g_mime_utils_header_decode_phrase): In the workaround case, if we
+	don't find an end marker, reset our inptr to the beginning of the
+	most recent word *plus 2*, to skip over the leading "=?".
+
+2010-09-16  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-encodings.c (g_mime_encoding_quoted_encode_close):
+	If the last input character is not a \n, append an "=\n" sequence.
+
+2010-09-13  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-charset.c: Mark known_iconv_charsets[] as
+	static. Also mark string members of various private structs as
+	const.
+
+2010-09-13  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.19
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2010-09-06  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-gpg-context.c (g_set_error_literal): glib 2.12
+	doesn't have this function, so in order to keep our current glib
+	requirements, we need to supply our own version if
+	GLIB_MINOR_VERSION < 2.18 (which is when this function was
+	introduced).
+
+2010-09-02  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/internet-address.c (group_to_string): Don't crash if the
+	group name is unset. Thanks to Damian Pietras for this patch.
+
+2010-09-01  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-utils.c (g_mime_utils_header_decode_phrase):
+	Implement the same rfc2047-workaround hack as the one found in
+	g_mime_utils_header_decode_text().
+
+	* gmime/gmime-encodings.c (g_mime_encoding_base64_decode_step):
+	Need to keep state to keep track of the number of ='s we've backed
+	out over in case it crosses buffer boundaries.
+
+2010-08-30  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-param.c (decode_token): Make less strict in order to
+	handle unquoted boundary values containing '=' (and other illegal
+	characters).
+
+2010-08-27  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.18
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2010-08-26  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/internet-address.c (_internet_address_set_name): Don't
+	decode/unquote the name. The docs for all the functions that call
+	this assume the name string is in its decoded form already.
+	(_internet_address_decode_name): New internal function that
+	decodes a string and sets it as the name on the InternetAddress.
+	(decode_address): Rewritten to be even more liberal in what it
+	accepts.
+
+2010-06-20  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-multipart-encrypted.c (g_mime_multipart_encrypted_decrypt):
+	Don't unref the encrypted content mime part object when the
+	content-type doesn't match application/octet-stream,
+	g_mime_multipart_get_part() does not ref parts it returns. We also
+	need to set an error when this happens.
+
+2010-05-18  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.17
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+	* gmime/gmime-encodings.h (GMIME_QP_ENCODE_LEN): Since
+	force-wrapped lines use "=\n" instead of just "\n", lines will be
+	74 bytes, not 73.
+
+2010-05-15  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.16
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2010-05-14  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-encodings.h (GMIME_QP_ENCODE_LEN): Fixed to take
+	into acount the possibility of having to force-wrap lines at 72+
+	characters.
+
+2010-05-06  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-data-wrapper.c (g_mime_data_wrapper_get_stream):
+	Fixed documentation.
+
+2010-04-13  Jeffrey Stedfast  <fejj at novell.com>
+
+	* configure.ac: Added a --disable-cryptography flag to allow
+	building without GnuPG or S/MIME support. Thanks to
+	pier11 at operamail.com for this patch. Fixes bug #615685.
+
+	* tests/test-streams.c: Use glib's G_GINT64_FORMAT and
+	G_GSIZE_FORMAT macros for our various *printf needs to be more
+	portable. Thanks to pier11 at operamail.com for this patch.
+
+	* gmime/gmime-gpg-context.c: Use g_set_error_literal() when no
+	printf-style arguments are needed. Fixes bug #615594. Thanks to
+	Tobias Mueller and Christian Persch.
+
+	* Applied patch by pier11 at operamail.com to fix the build for
+	MingW. Fixes bug #615068.
+
+2010-03-26  Jeffrey Stedfast  <fejj at novell.com>
+
+	Fixes for bug #613653
+
+	* gmime/gmime.c (g_mime_init): Initialize GMimeObject's type
+	registry.
+	(g_mime_shutdown): Shut it down here.
+
+	* gmime/gmime-object.c (g_mime_object_type_registry_init): Renamed
+	a bit and fixed to not use g_atexit(). Also made internal-public.
+	(g_mime_object_type_registry_shutdown): Renamed and made
+	internal-public. Also set type_hash to NULL after destroying it so
+	that a re-init will work.
+	(g_mime_object_register_type): Don't init the type system anymore.
+	(g_mime_object_new): Same.
+	(g_mime_object_new_type): Same here.
+
+2010-03-26  Jeffrey Stedfast  <fejj at novell.com>
+
+	Fixes for bug #598855
+
+	* gmime/gmime-message.c (process_header): Return TRUE if we match
+	MIME-Version.
+	(message_prepend_header): Don't drop MIME-Version headers.
+	(message_append_header): Same.
+	(message_set_header): Here too.
+	(message_get_header): Only return the hard-coded "1.0" value for
+	MIME-Version if it is not set on the header object.
+	(message_remove_header): Allow the MIME-Version header to be
+	removed.
+	(message_get_headers): Only write our own MIME-Version header if
+	one isn't already set in the message headers.
+	(message_write_to_stream): Same here.
+
+2010-02-02  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.15
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2010-01-31  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-encodings.h (GMIME_UUENCODE_LEN): Fixed to prevent
+	possible buffer overflows.
+
 2010-01-30  Jeffrey Stedfast  <fejj at novell.com>
 
 	* README: Bumped version
@@ -409,7 +689,7 @@
 2009-01-12  Jeffrey Stedfast  <fejj at novell.com>
 
 	* mono/Makefile.am: Fixed to parallel make install, thanks to
-	Diego Petten�ixes bug #567549.
+	Diego Pettenò. Fixes bug #567549.
 
 2009-01-09  Jeffrey Stedfast  <fejj at novell.com>
 
@@ -4830,7 +5110,7 @@
 	the token is shorter than the actual timezone string (but matches
 	the first little bit of it).
 
-2002-09-03  Tomasz K�oczko  <kloczek at pld.org.pl>
+2002-09-03  Tomasz K³oczko  <kloczek at pld.org.pl>
 
 	* Makefile.am: fixes for automake >= 1.5 (removed duplicated
 	variables) and few minor cleanups and better method for install gmime

Modified: packages/unstable/gmime2.4/INSTALL
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/INSTALL?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/INSTALL [utf-8] (original)
+++ packages/unstable/gmime2.4/INSTALL [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,0 +1,302 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Modified: packages/unstable/gmime2.4/README
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/README?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/README [utf-8] (original)
+++ packages/unstable/gmime2.4/README [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,4 +1,4 @@
-                            GMime, version 2.4.14
+                            GMime, version 2.4.23
                    by Jeffrey Stedfast <fejj at gnome.org>
 
 
@@ -65,7 +65,7 @@
 LICENSE INFORMATION
 -------------------
 
-The GMime library is Copyright (C) 2000-2009 Jeffrey Stedfast.
+The GMime library is Copyright (C) 2000-2010 Jeffrey Stedfast.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -142,7 +142,7 @@
 
   AUTHORS               List of primary authors (source code developers)
 
-  COPYING               The GNU General Public License, version 2
+  COPYING               The GNU Lesser General Public License, version 2
 
   ChangeLog             Log of changes made to the source code
 

Modified: packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/build/vs2008/gmime.vcproj?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] (original)
+++ packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] Mon Mar 14 20:31:22 2011
@@ -41,7 +41,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;14&quot;"
+				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;23&quot;"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;..\..\&quot;; &quot;..\..\util&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\&quot;GMime\&quot;"
@@ -106,7 +106,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;14&quot;"
+				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;23&quot;"
 				AdditionalIncludeDirectories="&quot;..\..\&quot;; &quot;..\..\util&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\&quot;GMime\&quot;"
 				RuntimeLibrary="2"

Modified: packages/unstable/gmime2.4/config.h.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/config.h.in?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/config.h.in [utf-8] (original)
+++ packages/unstable/gmime2.4/config.h.in [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,4 +1,7 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define if cryptography in GMime is enabled. */
+#undef ENABLE_CRYPTOGRAPHY
 
 /* Define if GMime should enable warning output. */
 #undef ENABLE_WARNINGS

Modified: packages/unstable/gmime2.4/configure
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure [utf-8] (original)
+++ packages/unstable/gmime2.4/configure [utf-8] Mon Mar 14 20:31:22 2011
@@ -816,6 +816,8 @@
 GLIB_GENMARSHAL
 GLIB_LIBS
 GLIB_CFLAGS
+ENABLE_CRYPTOGRAPHY_FALSE
+ENABLE_CRYPTOGRAPHY_TRUE
 HAVE_DOCBOOK_FALSE
 HAVE_DOCBOOK_TRUE
 DB2HTML
@@ -964,6 +966,7 @@
 enable_gtk_doc
 enable_profiling
 enable_warnings
+enable_cryptography
 enable_glibtest
 enable_rpath
 with_libiconv_prefix
@@ -1623,6 +1626,8 @@
   --enable-profiling      enable profiling compile flags [default=no]
   --enable-warnings       enable g_warning output when invalid MIME is
                           encountered [default=no]
+  --disable-cryptography  disables cryptography support in GMIME
+                          [default=no]
   --disable-glibtest      do not try to compile and run a test GLIB program
   --disable-rpath         do not hardcode runtime library paths
   --enable-largefile      enable support for large files [default=yes]
@@ -2107,7 +2112,7 @@
 
 GMIME_MAJOR_VERSION=2
 GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=14
+GMIME_MICRO_VERSION=23
 GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
 GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
 
@@ -6973,13 +6978,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6976: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6981: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6979: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6984: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6982: output\"" >&5)
+  (eval echo "\"\$as_me:6987: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8173,7 +8178,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8176 "configure"' > conftest.$ac_ext
+  echo '#line 8181 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9611,11 +9616,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9614: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9619: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9618: \$? = $ac_status" >&5
+   echo "$as_me:9623: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9950,11 +9955,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9953: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9958: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9957: \$? = $ac_status" >&5
+   echo "$as_me:9962: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10055,11 +10060,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10058: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10063: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10062: \$? = $ac_status" >&5
+   echo "$as_me:10067: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10110,11 +10115,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10113: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10118: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10117: \$? = $ac_status" >&5
+   echo "$as_me:10122: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12910,7 +12915,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12913 "configure"
+#line 12918 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13006,7 +13011,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13009 "configure"
+#line 13014 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16338,6 +16343,29 @@
 
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_WARNINGS 1
+_ACEOF
+
+fi
+
+# Check whether --enable-cryptography was given.
+if test "${enable_cryptography+set}" = set; then
+  enableval=$enable_cryptography;
+else
+  enable_cryptography=yes
+fi
+
+ if test "x$enable_cryptography" = "xyes"; then
+  ENABLE_CRYPTOGRAPHY_TRUE=
+  ENABLE_CRYPTOGRAPHY_FALSE='#'
+else
+  ENABLE_CRYPTOGRAPHY_TRUE='#'
+  ENABLE_CRYPTOGRAPHY_FALSE=
+fi
+
+if test "x$enable_cryptography" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_CRYPTOGRAPHY 1
 _ACEOF
 
 fi
@@ -21177,6 +21205,13 @@
   { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 $as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${ENABLE_CRYPTOGRAPHY_TRUE}" && test -z "${ENABLE_CRYPTOGRAPHY_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_CRYPTOGRAPHY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ENABLE_CRYPTOGRAPHY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23470,6 +23505,7 @@
 
   Large file support:   ${enable_largefile}
   Console warnings:     ${enable_warnings}
+  PGP/MIME support:     ${enable_cryptography}
 
   Mono bindings:        ${enable_mono}
 "

Modified: packages/unstable/gmime2.4/configure.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure.in?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure.in [utf-8] (original)
+++ packages/unstable/gmime2.4/configure.in [utf-8] Mon Mar 14 20:31:22 2011
@@ -12,7 +12,7 @@
 
 GMIME_MAJOR_VERSION=2
 GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=14
+GMIME_MICRO_VERSION=23
 GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
 GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
 
@@ -155,6 +155,16 @@
 	      enable_warnings=no)
 if test "x$enable_warnings" = "xyes"; then
   AC_DEFINE(ENABLE_WARNINGS, 1, [Define if GMime should enable warning output.])
+fi
+
+dnl Disable cryptography support
+AC_ARG_ENABLE(cryptography,
+              AC_HELP_STRING([--disable-cryptography],
+              [disables cryptography support in GMIME [[default=no]]]),,
+              enable_cryptography=yes)
+AM_CONDITIONAL(ENABLE_CRYPTOGRAPHY, test "x$enable_cryptography" = "xyes")
+if test "x$enable_cryptography" = "xyes"; then
+  AC_DEFINE(ENABLE_CRYPTOGRAPHY, 1, [Define if cryptography in GMime is enabled.])
 fi
 
 dnl We need at *least* glib 2.12.0 for g_hash_table_remove_all()
@@ -541,6 +551,7 @@
 
   Large file support:   ${enable_largefile}
   Console warnings:     ${enable_warnings}
+  PGP/MIME support:     ${enable_cryptography}
 
   Mono bindings:        ${enable_mono}
 "

Modified: packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml [utf-8] Mon Mar 14 20:31:22 2011
@@ -82,7 +82,7 @@
       </author>
     </authorgroup>
     <copyright>
-      <year>2000-2009</year>
+      <year>2000-2010</year>
       <holder>Jeffrey Stedfast</holder>
     </copyright>
 

Modified: packages/unstable/gmime2.4/docs/reference/html/MimeParts.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/MimeParts.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/MimeParts.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/MimeParts.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -50,10 +50,10 @@
 <span class="refentrytitle"><a href="gmime-gmime-multipart.html">GMimeMultipart</a></span><span class="refpurpose"> — MIME multiparts</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="gmime-gmime-multipart-encrypted.html">GMimeMultpartEncrypted</a></span><span class="refpurpose"> — Encrypted MIME multiparts</span>
+<span class="refentrytitle"><a href="gmime-gmime-multipart-encrypted.html">GMimeMultipartEncrypted</a></span><span class="refpurpose"> — Encrypted MIME multiparts</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="gmime-gmime-multipart-signed.html">GMimeMultpartSigned</a></span><span class="refpurpose"> — Signed MIME multiparts</span>
+<span class="refentrytitle"><a href="gmime-gmime-multipart-signed.html">GMimeMultipartSigned</a></span><span class="refpurpose"> — Signed MIME multiparts</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="gmime-gmime-message-part.html">GMimeMessagePart</a></span><span class="refpurpose"> — Message parts</span>

Modified: packages/unstable/gmime2.4/docs/reference/html/ch01.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/ch01.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/ch01.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/ch01.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -35,7 +35,7 @@
 </tr></table>
 <div class="chapter" title="Class hierarchy">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2586146"></a>Class hierarchy</h2></div></div></div>
+<a name="id2586027"></a>Class hierarchy</h2></div></div></div>
 <pre class="screen">
     GMimeHeader
     <a class="link" href="gmime-gmime-param.html#GMimeParam" title="GMimeParam">GMimeParam</a>

Modified: packages/unstable/gmime2.4/docs/reference/html/classes.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/classes.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/classes.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/classes.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -161,10 +161,10 @@
 <span class="refentrytitle"><a href="gmime-gmime-multipart.html">GMimeMultipart</a></span><span class="refpurpose"> — MIME multiparts</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="gmime-gmime-multipart-encrypted.html">GMimeMultpartEncrypted</a></span><span class="refpurpose"> — Encrypted MIME multiparts</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="gmime-gmime-multipart-signed.html">GMimeMultpartSigned</a></span><span class="refpurpose"> — Signed MIME multiparts</span>
+<span class="refentrytitle"><a href="gmime-gmime-multipart-encrypted.html">GMimeMultipartEncrypted</a></span><span class="refpurpose"> — Encrypted MIME multiparts</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="gmime-gmime-multipart-signed.html">GMimeMultipartSigned</a></span><span class="refpurpose"> — Signed MIME multiparts</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="gmime-gmime-message-part.html">GMimeMessagePart</a></span><span class="refpurpose"> — Message parts</span>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -45,7 +45,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" title="Incompatible changes from 1.0 to 2.0">
-<a name="id2560051"></a><h2>Incompatible changes from 1.0 to 2.0</h2>
+<a name="id2559928"></a><h2>Incompatible changes from 1.0 to 2.0</h2>
 <p>
 See also the PORTING document in the toplevel GMime source directory.
 </p>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -43,7 +43,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" title="Incompatible changes from 2.0 to 2.2">
-<a name="id2559765"></a><h2>Incompatible changes from 2.0 to 2.2</h2>
+<a name="id2559641"></a><h2>Incompatible changes from 2.0 to 2.2</h2>
 <p>See also the PORTING document in the toplevel GMime source directory.</p>
 <p>There are no incompatible changes between 2.0 and 2.2.</p>
 <p>GMime 2.2 is both API and ABI compatible with GMime 2.0 meaning
@@ -55,7 +55,7 @@
 be deprecated in some future version, probably 3.0).</p>
 </div>
 <div class="refsect1" title="Replacement interfaces from 2.0 to 2.2">
-<a name="id2561038"></a><h2>Replacement interfaces from 2.0 to 2.2</h2>
+<a name="id2560914"></a><h2>Replacement interfaces from 2.0 to 2.2</h2>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><p>
 <code class="function">g_mime_utils_8bit_header_decode()</code> has been split

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -43,7 +43,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" title="Changes from 2.2 to 2.4">
-<a name="id2560700"></a><h2>Changes from 2.2 to 2.4</h2>
+<a name="id2560576"></a><h2>Changes from 2.2 to 2.4</h2>
 <p>GMime 2.4 has had a number of API changes since GMime
 2.2. To start, ALL public APIs that used to use off_t in GMime 2.2 now
 use gint64 so that the API and ABI do not change based on whether or

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -45,7 +45,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" title="Compiling GMime Applications on UNIX">
-<a name="id2559467"></a><h2>Compiling GMime Applications on UNIX</h2>
+<a name="id2559343"></a><h2>Compiling GMime Applications on UNIX</h2>
 <p>
 To compile a GMime application, you need to tell the compiler where to 
 find the GMime header files and libraries. This is done with the

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-charset.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-charset.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-charset.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-charset.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -161,18 +161,14 @@
 <a name="g-mime-locale-language"></a><h3>g_mime_locale_language ()</h3>
 <pre class="programlisting">const char *        g_mime_locale_language              (void);</pre>
 <p>
-Gets the user's locale language code (or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> by default).</p>
+Gets the user's locale language code (or <code class="literal">NULL</code> by default).</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user's locale language code (or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> by default).
+<td> the user's locale language code (or <code class="literal">NULL</code> by default).
 </td>
 </tr></tbody>
 </table></div>
@@ -184,9 +180,7 @@
 <p>
 Attempts to find a specific language code that is specific to
 <em class="parameter"><code>charset</code></em>. Currently only handles CJK and Russian/Ukranian
-charset-&gt;lang mapping. Everything else will return <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.</p>
+charset-&gt;lang mapping. Everything else will return <code class="literal">NULL</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -199,9 +193,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a language code that is specific to <em class="parameter"><code>charset</code></em>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on
+<td> a language code that is specific to <em class="parameter"><code>charset</code></em>, or <code class="literal">NULL</code> on
 fail.
 </td>
 </tr>
@@ -444,9 +436,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the charset name best suited for the input text or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if
+<td> the charset name best suited for the input text or <code class="literal">NULL</code> if
 it is US-ASCII safe.
 </td>
 </tr>
@@ -491,11 +481,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if it is safe to encode <em class="parameter"><code>text</code></em> into <em class="parameter"><code>charset</code></em> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <code class="literal">TRUE</code> if it is safe to encode <em class="parameter"><code>text</code></em> into <em class="parameter"><code>charset</code></em> or <code class="literal">FALSE</code>
 otherwise.
 </td>
 </tr>
@@ -534,9 +520,7 @@
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> an array of user-set charsets or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if none set.
+<td> an array of user-set charsets or <code class="literal">NULL</code> if none set.
 </td>
 </tr></tbody>
 </table></div>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -117,28 +117,28 @@
 <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *       <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-new" title="g_mime_signer_new ()">g_mime_signer_new</a>                   (void);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-free" title="g_mime_signer_free ()">g_mime_signer_free</a>                  (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *       <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-next" title="g_mime_signer_next ()">g_mime_signer_next</a>                  (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
-<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerStatus" title="enum GMimeSignerStatus">GMimeSignerStatus</a>   <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-status" title="g_mime_signer_get_status ()">g_mime_signer_get_status</a>            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerStatus" title="enum GMimeSignerStatus">GMimeSignerStatus</a>   <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-status" title="g_mime_signer_get_status ()">g_mime_signer_get_status</a>            (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-status" title="g_mime_signer_set_status ()">g_mime_signer_set_status</a>            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerStatus" title="enum GMimeSignerStatus">GMimeSignerStatus</a> status);
-<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerError" title="enum GMimeSignerError">GMimeSignerError</a>    <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-errors" title="g_mime_signer_get_errors ()">g_mime_signer_get_errors</a>            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerError" title="enum GMimeSignerError">GMimeSignerError</a>    <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-errors" title="g_mime_signer_get_errors ()">g_mime_signer_get_errors</a>            (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-errors" title="g_mime_signer_set_errors ()">g_mime_signer_set_errors</a>            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerError" title="enum GMimeSignerError">GMimeSignerError</a> error);
-<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerTrust" title="enum GMimeSignerTrust">GMimeSignerTrust</a>    <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-trust" title="g_mime_signer_get_trust ()">g_mime_signer_get_trust</a>             (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerTrust" title="enum GMimeSignerTrust">GMimeSignerTrust</a>    <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-trust" title="g_mime_signer_get_trust ()">g_mime_signer_get_trust</a>             (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-trust" title="g_mime_signer_set_trust ()">g_mime_signer_set_trust</a>             (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerTrust" title="enum GMimeSignerTrust">GMimeSignerTrust</a> trust);
-const char *        <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-fingerprint" title="g_mime_signer_get_fingerprint ()">g_mime_signer_get_fingerprint</a>       (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+const char *        <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-fingerprint" title="g_mime_signer_get_fingerprint ()">g_mime_signer_get_fingerprint</a>       (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-fingerprint" title="g_mime_signer_set_fingerprint ()">g_mime_signer_set_fingerprint</a>       (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          const char *fingerprint);
-const char *        <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-key-id" title="g_mime_signer_get_key_id ()">g_mime_signer_get_key_id</a>            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+const char *        <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-key-id" title="g_mime_signer_get_key_id ()">g_mime_signer_get_key_id</a>            (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-key-id" title="g_mime_signer_set_key_id ()">g_mime_signer_set_key_id</a>            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          const char *key_id);
-const char *        <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-name" title="g_mime_signer_get_name ()">g_mime_signer_get_name</a>              (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+const char *        <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-name" title="g_mime_signer_get_name ()">g_mime_signer_get_name</a>              (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-name" title="g_mime_signer_set_name ()">g_mime_signer_set_name</a>              (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          const char *name);
-time_t              <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-created" title="g_mime_signer_get_created ()">g_mime_signer_get_created</a>           (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+time_t              <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-created" title="g_mime_signer_get_created ()">g_mime_signer_get_created</a>           (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-created" title="g_mime_signer_set_created ()">g_mime_signer_set_created</a>           (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          time_t created);
-time_t              <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-expires" title="g_mime_signer_get_expires ()">g_mime_signer_get_expires</a>           (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
+time_t              <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-get-expires" title="g_mime_signer_get_expires ()">g_mime_signer_get_expires</a>           (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);
 void                <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signer-set-expires" title="g_mime_signer_set_expires ()">g_mime_signer_set_expires</a>           (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer,
                                                          time_t expires);
 <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity">GMimeSignatureValidity</a> * <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signature-validity-new" title="g_mime_signature_validity_new ()">g_mime_signature_validity_new</a>  (void);
@@ -618,9 +618,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the equivalent hash name or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+<td> the equivalent hash name or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>
@@ -697,9 +695,7 @@
 >GError</a> **err);</pre>
 <p>
 Verifies the signature. If <em class="parameter"><code>istream</code></em> is a clearsigned stream,
-you should pass <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> as the sigstream parameter. Otherwise
+you should pass <code class="literal">NULL</code> as the sigstream parameter. Otherwise
 <em class="parameter"><code>sigstream</code></em> is assumed to be the signature stream and is used to
 verify the integirity of the <em class="parameter"><code>istream</code></em>.</p>
 <p>
@@ -737,9 +733,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity"><span class="type">GMimeSignatureValidity</span></a> structure containing information
-about the integrity of the input stream or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on failure to
+about the integrity of the input stream or <code class="literal">NULL</code> on failure to
 execute at all.
 </td>
 </tr>
@@ -782,9 +776,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>userid</code></em> :</span></p></td>
-<td> key id (or email address) to use when signing (assuming <em class="parameter"><code>sign</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a>)
+<td> key id (or email address) to use when signing (assuming <em class="parameter"><code>sign</code></em> is <code class="literal">TRUE</code>)
 </td>
 </tr>
 <tr>
@@ -869,9 +861,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity"><span class="type">GMimeSignatureValidity</span></a> on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on error.
+<td> a <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity"><span class="type">GMimeSignatureValidity</span></a> on success or <code class="literal">NULL</code> on error.
 </td>
 </tr>
 </tbody>
@@ -989,7 +979,8 @@
 <a name="g-mime-signer-free"></a><h3>g_mime_signer_free ()</h3>
 <pre class="programlisting">void                g_mime_signer_free                  (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
-Free's the singleton signer.</p>
+Frees a singleton signer. Should NOT be used to free signers
+returned from <a class="link" href="gmime-gmime-cipher-context.html#g-mime-signature-validity-get-signers" title="g_mime_signature_validity_get_signers ()"><code class="function">g_mime_signature_validity_get_signers()</code></a>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1019,9 +1010,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the next <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner"><span class="type">GMimeSigner</span></a> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> when complete.
+<td> the next <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner"><span class="type">GMimeSigner</span></a> or <code class="literal">NULL</code> when complete.
 </td>
 </tr>
 </tbody>
@@ -1030,7 +1019,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_status ()">
 <a name="g-mime-signer-get-status"></a><h3>g_mime_signer_get_status ()</h3>
-<pre class="programlisting"><a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerStatus" title="enum GMimeSignerStatus">GMimeSignerStatus</a>   g_mime_signer_get_status            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting"><a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerStatus" title="enum GMimeSignerStatus">GMimeSignerStatus</a>   g_mime_signer_get_status            (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the signer status.</p>
 <p>
@@ -1079,7 +1068,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_errors ()">
 <a name="g-mime-signer-get-errors"></a><h3>g_mime_signer_get_errors ()</h3>
-<pre class="programlisting"><a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerError" title="enum GMimeSignerError">GMimeSignerError</a>    g_mime_signer_get_errors            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting"><a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerError" title="enum GMimeSignerError">GMimeSignerError</a>    g_mime_signer_get_errors            (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the signer errors.</p>
 <p>
@@ -1128,7 +1117,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_trust ()">
 <a name="g-mime-signer-get-trust"></a><h3>g_mime_signer_get_trust ()</h3>
-<pre class="programlisting"><a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerTrust" title="enum GMimeSignerTrust">GMimeSignerTrust</a>    g_mime_signer_get_trust             (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting"><a class="link" href="gmime-gmime-cipher-context.html#GMimeSignerTrust" title="enum GMimeSignerTrust">GMimeSignerTrust</a>    g_mime_signer_get_trust             (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the signer trust.</p>
 <p>
@@ -1177,7 +1166,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_fingerprint ()">
 <a name="g-mime-signer-get-fingerprint"></a><h3>g_mime_signer_get_fingerprint ()</h3>
-<pre class="programlisting">const char *        g_mime_signer_get_fingerprint       (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting">const char *        g_mime_signer_get_fingerprint       (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the signer's key fingerprint.</p>
 <p>
@@ -1226,7 +1215,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_key_id ()">
 <a name="g-mime-signer-get-key-id"></a><h3>g_mime_signer_get_key_id ()</h3>
-<pre class="programlisting">const char *        g_mime_signer_get_key_id            (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting">const char *        g_mime_signer_get_key_id            (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the signer's key id.</p>
 <p>
@@ -1275,7 +1264,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_name ()">
 <a name="g-mime-signer-get-name"></a><h3>g_mime_signer_get_name ()</h3>
-<pre class="programlisting">const char *        g_mime_signer_get_name              (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting">const char *        g_mime_signer_get_name              (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the signer's name.</p>
 <p>
@@ -1324,7 +1313,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_created ()">
 <a name="g-mime-signer-get-created"></a><h3>g_mime_signer_get_created ()</h3>
-<pre class="programlisting">time_t              g_mime_signer_get_created           (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting">time_t              g_mime_signer_get_created           (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the creation date of the signer's key.</p>
 <p>
@@ -1339,7 +1328,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the creation date of the signer's key.
+<td> the creation date of the signer's key or <code class="literal">-1</code> if unknown.
 </td>
 </tr>
 </tbody>
@@ -1373,7 +1362,7 @@
 <hr>
 <div class="refsect2" title="g_mime_signer_get_expires ()">
 <a name="g-mime-signer-get-expires"></a><h3>g_mime_signer_get_expires ()</h3>
-<pre class="programlisting">time_t              g_mime_signer_get_expires           (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
+<pre class="programlisting">time_t              g_mime_signer_get_expires           (const <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
 Get the expiration date of the signer's key.</p>
 <p>
@@ -1388,7 +1377,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the expiration date of the signer's key.
+<td> the expiration date of the signer's key or <code class="literal">-1</code> if unknown.
 </td>
 </tr>
 </tbody>
@@ -1562,7 +1551,8 @@
                                                         (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity">GMimeSignatureValidity</a> *validity,
                                                          <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
-Adds <em class="parameter"><code>signer</code></em> to the list of signers on <em class="parameter"><code>validity</code></em>.</p>
+Adds <em class="parameter"><code>signer</code></em> to the list of signers on <em class="parameter"><code>validity</code></em>. Once the signer
+is added, it must NOT be freed.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1601,7 +1591,8 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner"><span class="type">GMimeSigner</span></a> list which contain further information such
-as trust and cipher keys.
+as trust and cipher keys. These signers are part of the
+<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity"><span class="type">GMimeSignatureValidity</span></a> and should NOT be freed individually.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-content-type.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-content-type.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-content-type.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-content-type.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -127,16 +127,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td> MIME type (or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> for "text")
+<td> MIME type (or <code class="literal">NULL</code> for "text")
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>subtype</code></em> :</span></p></td>
-<td> MIME subtype (or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> for "plain")
+<td> MIME subtype (or <code class="literal">NULL</code> for "plain")
 </td>
 </tr>
 <tr>
@@ -411,9 +407,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a const pointer to the paramer value specified by
-<em class="parameter"><code>attribute</code></em> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+<em class="parameter"><code>attribute</code></em> or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-data-wrapper.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-data-wrapper.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-data-wrapper.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-data-wrapper.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -199,8 +199,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a reference to the internal stream. Caller is responsible
-for unrefing it.
+<td> a reference to the internal stream.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-disposition.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-disposition.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-disposition.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-disposition.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -168,9 +168,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>str</code></em> :</span></p></td>
-<td> Content-Disposition field value or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> Content-Disposition field value or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -216,9 +214,7 @@
 <pre class="programlisting">const char *        g_mime_content_disposition_get_disposition
                                                         (<a class="link" href="gmime-gmime-disposition.html#GMimeContentDisposition">GMimeContentDisposition</a> *disposition);</pre>
 <p>
-Gets the disposition or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.</p>
+Gets the disposition or <code class="literal">NULL</code> on fail.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -328,9 +324,7 @@
                                                         (<a class="link" href="gmime-gmime-disposition.html#GMimeContentDisposition">GMimeContentDisposition</a> *disposition,
                                                          const char *attribute);</pre>
 <p>
-Gets the value of the parameter <em class="parameter"><code>attribute</code></em>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.</p>
+Gets the value of the parameter <em class="parameter"><code>attribute</code></em>, or <code class="literal">NULL</code> on fail.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -257,9 +257,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the encoding type as a string or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on error. Available
+<td> the encoding type as a string or <code class="literal">NULL</code> on error. Available
 values for the encoding are: <a class="link" href="gmime-gmime-encodings.html#GMIME-CONTENT-ENCODING-DEFAULT--CAPS"><span class="type">GMIME_CONTENT_ENCODING_DEFAULT</span></a>,
 <a class="link" href="gmime-gmime-encodings.html#GMIME-CONTENT-ENCODING-7BIT--CAPS"><span class="type">GMIME_CONTENT_ENCODING_7BIT</span></a>, <a class="link" href="gmime-gmime-encodings.html#GMIME-CONTENT-ENCODING-8BIT--CAPS"><span class="type">GMIME_CONTENT_ENCODING_8BIT</span></a>,
 <a class="link" href="gmime-gmime-encodings.html#GMIME-CONTENT-ENCODING-BINARY--CAPS"><span class="type">GMIME_CONTENT_ENCODING_BINARY</span></a>, <a class="link" href="gmime-gmime-encodings.html#GMIME-CONTENT-ENCODING-BASE64--CAPS"><span class="type">GMIME_CONTENT_ENCODING_BASE64</span></a>,
@@ -302,11 +300,7 @@
 <td><p><span class="term"><a
 href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
 >gboolean</a> <em class="structfield"><code>encode</code></em>;</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if encoding or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> if decoding
+<td> <code class="literal">TRUE</code> if encoding or <code class="literal">FALSE</code> if decoding
 </td>
 </tr>
 <tr>
@@ -726,7 +720,7 @@
 <hr>
 <div class="refsect2" title="GMIME_UUENCODE_LEN()">
 <a name="GMIME-UUENCODE-LEN--CAPS"></a><h3>GMIME_UUENCODE_LEN()</h3>
-<pre class="programlisting">#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 62))
+<pre class="programlisting">#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 64))
 </pre>
 <p>
 Calculates the maximum number of bytes needed to uuencode the full
@@ -913,7 +907,7 @@
 <hr>
 <div class="refsect2" title="GMIME_QP_ENCODE_LEN()">
 <a name="GMIME-QP-ENCODE-LEN--CAPS"></a><h3>GMIME_QP_ENCODE_LEN()</h3>
-<pre class="programlisting">#define GMIME_QP_ENCODE_LEN(x)     ((size_t) ((((x) + 1) * 3) + 1))
+<pre class="programlisting">#define GMIME_QP_ENCODE_LEN(x)     ((size_t) ((((x) / 24) * 74) + 74))
 </pre>
 <p>
 Calculates the maximum number of bytes needed to encode the full

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-basic.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-basic.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-basic.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-basic.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -114,11 +114,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>encode</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> to encode or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> to decode
+<td> <code class="literal">TRUE</code> to encode or <code class="literal">FALSE</code> to decode
 </td>
 </tr>
 <tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-charset.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-charset.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-charset.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-charset.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -115,9 +115,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new charset filter or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if the charset conversion is
+<td> a new charset filter or <code class="literal">NULL</code> if the charset conversion is
 not possible.
 </td>
 </tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-crlf.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-crlf.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-crlf.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-crlf.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -108,9 +108,7 @@
 Creates a new <a class="link" href="gmime-gmime-filter-crlf.html#GMimeFilterCRLF"><span class="type">GMimeFilterCRLF</span></a> filter.
 </p>
 <p>
-If <em class="parameter"><code>encode</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a>, then lone line-feeds ('\n') will be 'encoded'
+If <em class="parameter"><code>encode</code></em> is <code class="literal">TRUE</code>, then lone line-feeds ('\n') will be 'encoded'
 into the canonical CRLF end-of-line sequence ("\r\n") otherwise
 CRLF sequences will be 'decoded' into the UNIX line-ending form
 ('\n').
@@ -118,12 +116,8 @@
 <p>
 The <em class="parameter"><code>dots</code></em> parameter tells the filter whether or not it should
 encode or decode lines beginning with a dot ('.'). If both <em class="parameter"><code>encode</code></em>
-and <em class="parameter"><code>dots</code></em> are <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a>, then a '.' at the beginning of a line will be
-'encoded' into "..". If <em class="parameter"><code>encode</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>, then ".." at the
+and <em class="parameter"><code>dots</code></em> are <code class="literal">TRUE</code>, then a '.' at the beginning of a line will be
+'encoded' into "..". If <em class="parameter"><code>encode</code></em> is <code class="literal">FALSE</code>, then ".." at the
 beginning of a line will be decoded into a single '.'.</p>
 <p>
 </p>
@@ -132,11 +126,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>encode</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the filter should encode or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <code class="literal">TRUE</code> if the filter should encode or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 <tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-windows.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-windows.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-windows.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter-windows.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -145,12 +145,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the filtered stream has been detected to contain
-Windows-CP125# characters or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the filtered stream has been detected to contain
+Windows-CP125# characters or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-filter.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -334,9 +334,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>keep</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if existing data in the output buffer should be kept
+<td> <code class="literal">TRUE</code> if existing data in the output buffer should be kept
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -376,12 +376,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>iter1</code></em> and <em class="parameter"><code>iter2</code></em> refer to the same header or
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if <em class="parameter"><code>iter1</code></em> and <em class="parameter"><code>iter2</code></em> refer to the same header or
+<code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -407,11 +403,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> on success or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -437,11 +429,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> on success or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -467,11 +455,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> on success or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -497,11 +481,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> on success or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -529,11 +509,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>iter</code></em> is still valid or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if <em class="parameter"><code>iter</code></em> is still valid or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -557,9 +533,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the header name or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if invalid.
+<td> the header name or <code class="literal">NULL</code> if invalid.
 </td>
 </tr>
 </tbody>
@@ -583,9 +557,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the header name or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if invalid.
+<td> the header name or <code class="literal">NULL</code> if invalid.
 </td>
 </tr>
 </tbody>
@@ -617,11 +589,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the value was set or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise (indicates
+<td> <code class="literal">TRUE</code> if the value was set or <code class="literal">FALSE</code> otherwise (indicates
 invalid iter).
 </td>
 </tr>
@@ -652,11 +620,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> on success or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -703,9 +667,7 @@
                                                          const char *name,
                                                          const char *value);</pre>
 <p>
-Prepends a header. If <em class="parameter"><code>value</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, a space will be set aside
+Prepends a header. If <em class="parameter"><code>value</code></em> is <code class="literal">NULL</code>, a space will be set aside
 for it (useful for setting the order of headers before values can
 be obtained for them) otherwise the header will be unset.</p>
 <p>
@@ -738,9 +700,7 @@
                                                          const char *name,
                                                          const char *value);</pre>
 <p>
-Appends a header. If <em class="parameter"><code>value</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, a space will be set aside for it
+Appends a header. If <em class="parameter"><code>value</code></em> is <code class="literal">NULL</code>, a space will be set aside for it
 (useful for setting the order of headers before values can be
 obtained for them) otherwise the header will be unset.</p>
 <p>
@@ -792,11 +752,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the header was successfully removed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> if
+<td> <code class="literal">TRUE</code> if the header was successfully removed or <code class="literal">FALSE</code> if
 the specified header could not be found.
 </td>
 </tr>
@@ -810,9 +766,7 @@
                                                          const char *name,
                                                          const char *value);</pre>
 <p>
-Set the value of the specified header. If <em class="parameter"><code>value</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> and the
+Set the value of the specified header. If <em class="parameter"><code>value</code></em> is <code class="literal">NULL</code> and the
 header, <em class="parameter"><code>name</code></em>, had not been previously set, a space will be set
 aside for it (useful for setting the order of headers before values
 can be obtained for them) otherwise the header will be unset.
@@ -900,11 +854,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if successful or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> if there are no headers to
+<td> a <code class="literal">TRUE</code> if successful or <code class="literal">FALSE</code> if there are no headers to
 traverse.
 </td>
 </tr>
@@ -952,9 +902,7 @@
                                                          <a class="link" href="gmime-gmime-header.html#GMimeHeaderWriter" title="GMimeHeaderWriter ()">GMimeHeaderWriter</a> writer);</pre>
 <p>
 Changes the function used to write <em class="parameter"><code>name</code></em> headers to <em class="parameter"><code>writer</code></em> (or the
-default if <em class="parameter"><code>writer</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>). This is useful if you want to change
+default if <em class="parameter"><code>writer</code></em> is <code class="literal">NULL</code>). This is useful if you want to change
 the default header folding style for a particular header.</p>
 <p>
 </p>
@@ -1052,9 +1000,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a class="link" href="gmime-gmime-stream.html#GMimeStream"><span class="type">GMimeStream</span></a> if set or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> otherwise.
+<td> a <a class="link" href="gmime-gmime-stream.html#GMimeStream"><span class="type">GMimeStream</span></a> if set or <code class="literal">NULL</code> otherwise.
 
 </td>
 </tr>
@@ -1113,11 +1059,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if a raw header is set or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if a raw header is set or <code class="literal">FALSE</code> otherwise.
 
 </td>
 </tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-iconv.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-iconv.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-iconv.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-iconv.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -152,12 +152,8 @@
 function <a class="link" href="gmime-gmime-iconv.html#g-mime-iconv-open" title="g_mime_iconv_open ()"><span class="type">g_mime_iconv_open</span></a>.
 </p>
 <p>
-The main case is when <em class="parameter"><code>inbuf</code></em> is not <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> and *inbuf is not
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>. In this case, the <a class="link" href="gmime-gmime-iconv.html#g-mime-iconv" title="g_mime_iconv()"><span class="type">g_mime_iconv</span></a> function converts the
+The main case is when <em class="parameter"><code>inbuf</code></em> is not <code class="literal">NULL</code> and *inbuf is not
+<code class="literal">NULL</code>. In this case, the <a class="link" href="gmime-gmime-iconv.html#g-mime-iconv" title="g_mime_iconv()"><span class="type">g_mime_iconv</span></a> function converts the
 multibyte sequence starting at *inbuf to a multibyte sequence
 starting at *outbuf. At most *inleft bytes, starting at *inbuf,
 will be read. At most *outleft bytes, starting at *outbuf, will
@@ -195,16 +191,8 @@
 (size_t)(-1).
 </p>
 <p>
-A different case is when <em class="parameter"><code>inbuf</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> or *inbuf is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, but
-<em class="parameter"><code>outbuf</code></em> is not <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> and *outbuf is not <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>. In this case, the
+A different case is when <em class="parameter"><code>inbuf</code></em> is <code class="literal">NULL</code> or *inbuf is <code class="literal">NULL</code>, but
+<em class="parameter"><code>outbuf</code></em> is not <code class="literal">NULL</code> and *outbuf is not <code class="literal">NULL</code>. In this case, the
 <a class="link" href="gmime-gmime-iconv.html#g-mime-iconv" title="g_mime_iconv()"><span class="type">g_mime_iconv</span></a> function attempts to set <em class="parameter"><code>cd</code></em>'s conversion state to
 the initial state and store a corresponding shift sequence at
 *outbuf.  At most *outleft bytes, starting at *outbuf, will be
@@ -214,16 +202,8 @@
 number of bytes written.
 </p>
 <p>
-A third case is when <em class="parameter"><code>inbuf</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> or *inbuf is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, and
-<em class="parameter"><code>outbuf</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> or *outbuf is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>. In this case, the
+A third case is when <em class="parameter"><code>inbuf</code></em> is <code class="literal">NULL</code> or *inbuf is <code class="literal">NULL</code>, and
+<em class="parameter"><code>outbuf</code></em> is <code class="literal">NULL</code> or *outbuf is <code class="literal">NULL</code>. In this case, the
 <a class="link" href="gmime-gmime-iconv.html#g-mime-iconv" title="g_mime_iconv()"><span class="type">g_mime_iconv</span></a> function sets <em class="parameter"><code>cd</code></em>'s conversion state to the initial
 state.</p>
 <p>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-part.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-part.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-part.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-part.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="GMime 2.4 Reference Manual">
 <link rel="up" href="MimeParts.html" title="MIME Messages and Parts">
-<link rel="prev" href="gmime-gmime-multipart-signed.html" title="GMimeMultpartSigned">
+<link rel="prev" href="gmime-gmime-multipart-signed.html" title="GMimeMultipartSigned">
 <link rel="next" href="gmime-gmime-message-partial.html" title="GMimeMessagePartial">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -110,9 +110,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>subtype</code></em> :</span></p></td>
-<td> message subtype or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> for "rfc822"
+<td> message subtype or <code class="literal">NULL</code> for "rfc822"
 </td>
 </tr>
 <tr>
@@ -140,9 +138,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>subtype</code></em> :</span></p></td>
-<td> message subtype or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> for "rfc822"
+<td> message subtype or <code class="literal">NULL</code> for "rfc822"
 </td>
 </tr>
 <tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-partial.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-partial.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-partial.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message-partial.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -156,9 +156,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the message/partial id or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+<td> the message/partial id or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>
@@ -240,9 +238,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a GMimeMessage object on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+<td> a GMimeMessage object on success or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>
@@ -283,9 +279,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> an array of <a class="link" href="gmime-gmime-message.html#GMimeMessage"><span class="type">GMimeMessage</span></a> objects and sets <em class="parameter"><code>nparts</code></em> to th
-number of messages returned or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+number of messages returned or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-message.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -169,14 +169,10 @@
 href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
 >gboolean</a> pretty_headers);</pre>
 <p>
-If <em class="parameter"><code>pretty_headers</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a>, then the standard rfc822 headers are
+If <em class="parameter"><code>pretty_headers</code></em> is <code class="literal">TRUE</code>, then the standard rfc822 headers are
 initialized so as to put headers in a nice friendly order. This is
 strictly a cosmetic thing, so if you are unsure, it is safe to say
-no (<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>).</p>
+no (<code class="literal">FALSE</code>).</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -320,9 +316,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td> The recipient's name (or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>)
+<td> The recipient's name (or <code class="literal">NULL</code>)
 </td>
 </tr>
 <tr>
@@ -383,9 +377,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a newly allocated <a class="link" href="gmime-internet-address-list.html#InternetAddressList"><span class="type">InternetAddressList</span></a> containing all
-recipients of the message or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if no recipients are set.
+recipients of the message or <code class="literal">NULL</code> if no recipients are set.
 </td>
 </tr>
 </tbody>
@@ -479,9 +471,7 @@
                                                          int *tz_offset);</pre>
 <p>
 Stores the date in time_t format in <em class="parameter"><code>date</code></em>. If <em class="parameter"><code>tz_offset</code></em> is
-non-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, then the timezone offset in will be stored in
+non-<code class="literal">NULL</code>, then the timezone offset in will be stored in
 <em class="parameter"><code>tz_offset</code></em>.</p>
 <p>
 </p>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-encrypted.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-encrypted.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-encrypted.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-encrypted.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GMimeMultpartEncrypted</title>
+<title>GMimeMultipartEncrypted</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="GMime 2.4 Reference Manual">
 <link rel="up" href="MimeParts.html" title="MIME Messages and Parts">
 <link rel="prev" href="gmime-gmime-multipart.html" title="GMimeMultipart">
-<link rel="next" href="gmime-gmime-multipart-signed.html" title="GMimeMultpartSigned">
+<link rel="next" href="gmime-gmime-multipart-signed.html" title="GMimeMultipartSigned">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <link rel="part" href="gmime.html" title="Part I. GMime Overview">
@@ -42,12 +42,12 @@
                 <a href="#gmime-gmime-multipart-encrypted.object-hierarchy" class="shortcut">Object Hierarchy</a>
 </td></tr>
 </table>
-<div class="refentry" title="GMimeMultpartEncrypted">
+<div class="refentry" title="GMimeMultipartEncrypted">
 <a name="gmime-gmime-multipart-encrypted"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
-<h2><span class="refentrytitle"><a name="gmime-gmime-multipart-encrypted.top_of_page"></a>GMimeMultpartEncrypted</span></h2>
-<p>GMimeMultpartEncrypted — Encrypted MIME multiparts</p>
+<h2><span class="refentrytitle"><a name="gmime-gmime-multipart-encrypted.top_of_page"></a>GMimeMultipartEncrypted</span></h2>
+<p>GMimeMultipartEncrypted — Encrypted MIME multiparts</p>
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
@@ -169,23 +169,17 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td> encryption cipher context
+<td> encryption context
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>sign</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the content should also be signed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <code class="literal">TRUE</code> if the content should also be signed or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>userid</code></em> :</span></p></td>
-<td> user id to use for signing (only used if <em class="parameter"><code>sign</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a>)
+<td> user id to use for signing (only used if <em class="parameter"><code>sign</code></em> is <code class="literal">TRUE</code>)
 </td>
 </tr>
 <tr>
@@ -220,12 +214,13 @@
 >GError</a> **err);</pre>
 <p>
 Attempts to decrypt the encrypted MIME part contained within the
-multipart/encrypted object <em class="parameter"><code>mpe</code></em> using the <em class="parameter"><code>ctx</code></em> decryption context.
-</p>
-<p>
-If <em class="parameter"><code>validity</code></em> is non-NULL, then on a successful decrypt operation,
-it will be updated to point to a newly-allocated
-<a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity"><span class="type">GMimeSignatureValidity</span></a> with signature status information.</p>
+multipart/encrypted object <em class="parameter"><code>mpe</code></em> using the <em class="parameter"><code>ctx</code></em> decryption
+context.
+</p>
+<p>
+For information regarding the signature status (in cases where the
+MIME part was both encrypted and signed), you may wish to check the
+results of <a class="link" href="gmime-gmime-multipart-encrypted.html#g-mime-multipart-encrypted-get-signature-validity" title="g_mime_multipart_encrypted_get_signature_validity ()"><code class="function">g_mime_multipart_encrypted_get_signature_validity()</code></a>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -238,7 +233,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td> decryption cipher context
+<td> decryption context
 </td>
 </tr>
 <tr>
@@ -250,11 +245,12 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the decrypted MIME part on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail. If the
-decryption fails, an exception will be set on <em class="parameter"><code>err</code></em> to provide
+<td> the decrypted MIME part on success or <code class="literal">NULL</code> on fail. If
+the decryption fails, an exception will be set on <em class="parameter"><code>err</code></em> to provide
 information as to why the failure occured.
+
+Note: On success, the decrypted MIME part is cached internally and
+so the returned <a class="link" href="gmime-gmime-object.html#GMimeObject"><span class="type">GMimeObject</span></a> must NOT be unreffed.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-signed.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-signed.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-signed.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart-signed.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GMimeMultpartSigned</title>
+<title>GMimeMultipartSigned</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="GMime 2.4 Reference Manual">
 <link rel="up" href="MimeParts.html" title="MIME Messages and Parts">
-<link rel="prev" href="gmime-gmime-multipart-encrypted.html" title="GMimeMultpartEncrypted">
+<link rel="prev" href="gmime-gmime-multipart-encrypted.html" title="GMimeMultipartEncrypted">
 <link rel="next" href="gmime-gmime-message-part.html" title="GMimeMessagePart">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -42,12 +42,12 @@
                 <a href="#gmime-gmime-multipart-signed.object-hierarchy" class="shortcut">Object Hierarchy</a>
 </td></tr>
 </table>
-<div class="refentry" title="GMimeMultpartSigned">
+<div class="refentry" title="GMimeMultipartSigned">
 <a name="gmime-gmime-multipart-signed"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
-<h2><span class="refentrytitle"><a name="gmime-gmime-multipart-signed.top_of_page"></a>GMimeMultpartSigned</span></h2>
-<p>GMimeMultpartSigned — Signed MIME multiparts</p>
+<h2><span class="refentrytitle"><a name="gmime-gmime-multipart-signed.top_of_page"></a>GMimeMultipartSigned</span></h2>
+<p>GMimeMultipartSigned — Signed MIME multiparts</p>
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
@@ -216,9 +216,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity"><span class="type">GMimeSignatureValidity</span></a> object on success or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a new <a class="link" href="gmime-gmime-cipher-context.html#GMimeSignatureValidity" title="GMimeSignatureValidity"><span class="type">GMimeSignatureValidity</span></a> object on success or <code class="literal">NULL</code>
 on fail. If the signing fails, an exception will be set on <em class="parameter"><code>err</code></em> to
 provide information as to why the failure occured.
 </td>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-multipart.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="GMime 2.4 Reference Manual">
 <link rel="up" href="MimeParts.html" title="MIME Messages and Parts">
 <link rel="prev" href="gmime-gmime-part.html" title="GMimePart">
-<link rel="next" href="gmime-gmime-multipart-encrypted.html" title="GMimeMultpartEncrypted">
+<link rel="next" href="gmime-gmime-multipart-encrypted.html" title="GMimeMultipartEncrypted">
 <meta name="generator" content="GTK-Doc V1.11 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 <link rel="part" href="gmime.html" title="Part I. GMime Overview">
@@ -280,9 +280,7 @@
                                                          const char *boundary);</pre>
 <p>
 Sets <em class="parameter"><code>boundary</code></em> as the boundary on the multipart. If <em class="parameter"><code>boundary</code></em> is
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, then a boundary will be auto-generated for you.</p>
+<code class="literal">NULL</code>, then a boundary will be auto-generated for you.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -295,9 +293,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>boundary</code></em> :</span></p></td>
-<td> boundary or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> to autogenerate one
+<td> boundary or <code class="literal">NULL</code> to autogenerate one
 </td>
 </tr>
 </tbody>
@@ -309,9 +305,7 @@
 <pre class="programlisting">const char *        g_mime_multipart_get_boundary       (<a class="link" href="gmime-gmime-multipart.html#GMimeMultipart">GMimeMultipart</a> *multipart);</pre>
 <p>
 Gets the boundary on the multipart. If the internal boundary is
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, then an auto-generated boundary will be set on the multipart
+<code class="literal">NULL</code>, then an auto-generated boundary will be set on the multipart
 and returned.</p>
 <p>
 </p>
@@ -431,11 +425,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the part was removed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the part was removed or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -465,9 +455,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the mime part that was removed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if the part was
+<td> the mime part that was removed or <code class="literal">NULL</code> if the part was
 not contained within the multipart.
 </td>
 </tr>
@@ -524,11 +512,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>part</code></em> is a subpart of <em class="parameter"><code>multipart</code></em> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <code class="literal">TRUE</code> if <em class="parameter"><code>part</code></em> is a subpart of <em class="parameter"><code>multipart</code></em> or <code class="literal">FALSE</code>
 otherwise.
 </td>
 </tr>
@@ -655,9 +639,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> the <a class="link" href="gmime-gmime-object.html#GMimeObject"><span class="type">GMimeObject</span></a> whose content-id matches the search string,
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if a match cannot be found.
+or <code class="literal">NULL</code> if a match cannot be found.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-object.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-object.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-object.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-object.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -324,9 +324,7 @@
 <pre class="programlisting"><a class="link" href="gmime-gmime-content-type.html#GMimeContentType">GMimeContentType</a> *  g_mime_object_get_content_type      (<a class="link" href="gmime-gmime-object.html#GMimeObject">GMimeObject</a> *object);</pre>
 <p>
 Gets the <a class="link" href="gmime-gmime-content-type.html#GMimeContentType"><span class="type">GMimeContentType</span></a> object for the given MIME object or
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.</p>
+<code class="literal">NULL</code> on fail.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -403,9 +401,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the value of the requested content-type param or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on
+<td> the value of the requested content-type param or <code class="literal">NULL</code> on
 if the param doesn't exist.
 </td>
 </tr>
@@ -445,9 +441,7 @@
 <a name="g-mime-object-get-disposition"></a><h3>g_mime_object_get_disposition ()</h3>
 <pre class="programlisting">const char *        g_mime_object_get_disposition       (<a class="link" href="gmime-gmime-object.html#GMimeObject">GMimeObject</a> *object);</pre>
 <p>
-Gets the MIME object's disposition if set or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> otherwise.</p>
+Gets the MIME object's disposition if set or <code class="literal">NULL</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -559,9 +553,7 @@
                                                          const char *attribute);</pre>
 <p>
 Gets the value of the Content-Disposition parameter specified by
-<em class="parameter"><code>attribute</code></em>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if the parameter does not exist.</p>
+<em class="parameter"><code>attribute</code></em>, or <code class="literal">NULL</code> if the parameter does not exist.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -723,11 +715,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the header was removed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> if it could not
+<td> <code class="literal">TRUE</code> if the header was removed or <code class="literal">FALSE</code> if it could not
 be found.
 </td>
 </tr>
@@ -771,9 +759,7 @@
 <pre class="programlisting">const char *        g_mime_object_get_header            (<a class="link" href="gmime-gmime-object.html#GMimeObject">GMimeObject</a> *object,
                                                          const char *header);</pre>
 <p>
-Gets the value of the requested header if it exists or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+Gets the value of the requested header if it exists or <code class="literal">NULL</code>
 otherwise.</p>
 <p>
 </p>
@@ -792,9 +778,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the value of the header <em class="parameter"><code>header</code></em> if it exists or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> the value of the header <em class="parameter"><code>header</code></em> if it exists or <code class="literal">NULL</code>
 otherwise.
 </td>
 </tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-parser.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-parser.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-parser.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-parser.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -299,12 +299,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the <em class="parameter"><code>parser</code></em> will leave the content on disk or
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> if it will load the content into memory.
+<td> <code class="literal">TRUE</code> if the <em class="parameter"><code>parser</code></em> will leave the content on disk or
+<code class="literal">FALSE</code> if it will load the content into memory.
 </td>
 </tr>
 </tbody>
@@ -321,16 +317,12 @@
 Sets whether or not the <em class="parameter"><code>parser</code></em>'s underlying stream is persistent.
 </p>
 <p>
-If <em class="parameter"><code>persist</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a>, the <em class="parameter"><code>parser</code></em> will attempt to construct
+If <em class="parameter"><code>persist</code></em> is <code class="literal">TRUE</code>, the <em class="parameter"><code>parser</code></em> will attempt to construct
 messages/parts whose content will remain on disk rather than being
 loaded into memory so as to reduce memory usage. This is the default.
 </p>
 <p>
-If <em class="parameter"><code>persist</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>, the <em class="parameter"><code>parser</code></em> will always load message content
+If <em class="parameter"><code>persist</code></em> is <code class="literal">FALSE</code>, the <em class="parameter"><code>parser</code></em> will always load message content
 into memory.
 </p>
 <p>
@@ -403,11 +395,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scan_from</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> to scan From-lines or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <code class="literal">TRUE</code> to scan From-lines or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 </tbody>
@@ -470,11 +458,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>respect_content_length</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the parser should use Content-Length headers or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the parser should use Content-Length headers or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -495,9 +479,7 @@
 with <em class="parameter"><code>user_data</code></em> as the user_data argument.
 </p>
 <p>
-If <em class="parameter"><code>regex</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, then the previously registered regex callback
+If <em class="parameter"><code>regex</code></em> is <code class="literal">NULL</code>, then the previously registered regex callback
 is unregistered and no new callback is set.</p>
 <p>
 </p>
@@ -574,11 +556,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> on EOS or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> on EOS or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -602,9 +580,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a MIME part based on <em class="parameter"><code>parser</code></em> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+<td> a MIME part based on <em class="parameter"><code>parser</code></em> or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>
@@ -628,9 +604,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a MIME message or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+<td> a MIME message or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>
@@ -656,9 +630,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> the mbox-style From-line of the most recently parsed
-message or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on error.
+message or <code class="literal">NULL</code> on error.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-part.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-part.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-part.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-part.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -197,9 +197,7 @@
 <pre class="programlisting">const char *        g_mime_part_get_content_description (const <a class="link" href="gmime-gmime-part.html#GMimePart">GMimePart</a> *mime_part);</pre>
 <p>
 Gets the value of the Content-Description for the specified mime
-part if it exists or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> otherwise.</p>
+part if it exists or <code class="literal">NULL</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -249,9 +247,7 @@
 <pre class="programlisting">const char *        g_mime_part_get_content_id          (<a class="link" href="gmime-gmime-part.html#GMimePart">GMimePart</a> *mime_part);</pre>
 <p>
 Gets the content-id of the specified mime part if it exists, or
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> otherwise.</p>
+<code class="literal">NULL</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -289,9 +285,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>content_md5</code></em> :</span></p></td>
-<td> content md5 or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> to generate the md5 digest.
+<td> content md5 or <code class="literal">NULL</code> to generate the md5 digest.
 </td>
 </tr>
 </tbody>
@@ -303,9 +297,7 @@
 <pre class="programlisting">const char *        g_mime_part_get_content_md5         (<a class="link" href="gmime-gmime-part.html#GMimePart">GMimePart</a> *mime_part);</pre>
 <p>
 Gets the md5sum contained in the Content-Md5 header of the
-specified mime part if it exists, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> otherwise.</p>
+specified mime part if it exists, or <code class="literal">NULL</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -344,14 +336,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the md5 is valid or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise. Note: will
-return <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> if the mime part does not contain a Content-MD5.
+<td> <code class="literal">TRUE</code> if the md5 is valid or <code class="literal">FALSE</code> otherwise. Note: will
+return <code class="literal">FALSE</code> if the mime part does not contain a Content-MD5.
 </td>
 </tr>
 </tbody>
@@ -388,9 +374,7 @@
 <pre class="programlisting">const char *        g_mime_part_get_content_location    (<a class="link" href="gmime-gmime-part.html#GMimePart">GMimePart</a> *mime_part);</pre>
 <p>
 Gets the value of the Content-Location header if it exists, or
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> otherwise.</p>
+<code class="literal">NULL</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -489,9 +473,7 @@
 <a name="g-mime-part-get-filename"></a><h3>g_mime_part_get_filename ()</h3>
 <pre class="programlisting">const char *        g_mime_part_get_filename            (const <a class="link" href="gmime-gmime-part.html#GMimePart">GMimePart</a> *mime_part);</pre>
 <p>
-Gets the filename of the specificed mime part, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if the mime
+Gets the filename of the specificed mime part, or <code class="literal">NULL</code> if the mime
 part does not have the filename or name parameter set.</p>
 <p>
 </p>
@@ -518,9 +500,7 @@
 <a name="g-mime-part-get-content-object"></a><h3>g_mime_part_get_content_object ()</h3>
 <pre class="programlisting"><a class="link" href="gmime-gmime-data-wrapper.html#GMimeDataWrapper">GMimeDataWrapper</a> *  g_mime_part_get_content_object      (const <a class="link" href="gmime-gmime-part.html#GMimePart">GMimePart</a> *mime_part);</pre>
 <p>
-Gets the internal data-wrapper of the specified mime part, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+Gets the internal data-wrapper of the specified mime part, or <code class="literal">NULL</code>
 on error.</p>
 <p>
 </p>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session-simple.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session-simple.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session-simple.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session-simple.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -106,9 +106,7 @@
 <p>
 Sets the <em class="parameter"><code>request_passwd</code></em> callback function on the simple session
 object. <em class="parameter"><code>request_passwd</code></em> should return a malloc'd string containing
-the password that the user entered or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail as well as
+the password that the user entered or <code class="literal">NULL</code> on fail as well as
 setting the 'err' argument. The 'item' argument can be used as a
 unique key identifier if <em class="parameter"><code>request_passwd</code></em> decides to cache the
 passwd. The 'prompt' argument should be used as the string to
@@ -167,12 +165,8 @@
                                                          GMimeSimpleIsOnlineFunc is_online);</pre>
 <p>
 Sets the <em class="parameter"><code>is_online</code></em> callback function on the simple session
-object. <em class="parameter"><code>is_online</code></em> should return <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the network is reachable
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.</p>
+object. <em class="parameter"><code>is_online</code></em> should return <code class="literal">TRUE</code> if the network is reachable
+or <code class="literal">FALSE</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-session.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -139,9 +139,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>secret</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the characters the user types should be hidden
+<td> <code class="literal">TRUE</code> if the characters the user types should be hidden
 </td>
 </tr>
 <tr>
@@ -157,9 +155,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a string buffer containing the password for the requested
-item or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> on fail.
+item or <code class="literal">NULL</code> on fail.
 </td>
 </tr>
 </tbody>
@@ -219,11 +215,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the session is online or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the session is online or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -200,11 +200,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>stream</code></em> owns the backend FILE pointer or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <code class="literal">TRUE</code> if <em class="parameter"><code>stream</code></em> owns the backend FILE pointer or <code class="literal">FALSE</code>
 otherwise.
 </td>
 </tr>
@@ -222,12 +218,8 @@
 Sets whether or not <em class="parameter"><code>stream</code></em> owns the backend FILE pointer.
 </p>
 <p>
-Note: <em class="parameter"><code>owner</code></em> should be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the stream should <code class="function">fclose()</code> the
-backend FILE pointer when destroyed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.</p>
+Note: <em class="parameter"><code>owner</code></em> should be <code class="literal">TRUE</code> if the stream should <code class="function">fclose()</code> the
+backend FILE pointer when destroyed or <code class="literal">FALSE</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -240,11 +232,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>owner</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if this stream should own the FILE pointer or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <code class="literal">TRUE</code> if this stream should own the FILE pointer or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -189,11 +189,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>stream</code></em> owns the backend file descriptor or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <code class="literal">TRUE</code> if <em class="parameter"><code>stream</code></em> owns the backend file descriptor or <code class="literal">FALSE</code>
 otherwise.
 </td>
 </tr>
@@ -211,12 +207,8 @@
 Sets whether or not <em class="parameter"><code>stream</code></em> owns the backend file descriptor.
 </p>
 <p>
-Note: <em class="parameter"><code>owner</code></em> should be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the stream should <code class="function">close()</code> the
-backend file descriptor when destroyed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.</p>
+Note: <em class="parameter"><code>owner</code></em> should be <code class="literal">TRUE</code> if the stream should <code class="function">close()</code> the
+backend file descriptor when destroyed or <code class="literal">FALSE</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -229,11 +221,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>owner</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if this stream should own the file descriptor or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <code class="literal">TRUE</code> if this stream should own the file descriptor or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -262,11 +262,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>mem</code></em> owns the backend memory buffer or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <code class="literal">TRUE</code> if <em class="parameter"><code>mem</code></em> owns the backend memory buffer or <code class="literal">FALSE</code>
 otherwise.
 </td>
 </tr>
@@ -284,12 +280,8 @@
 Sets whether or not <em class="parameter"><code>mem</code></em> owns the backend memory buffer.
 </p>
 <p>
-Note: <em class="parameter"><code>owner</code></em> should be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the stream should free the backend
-memory buffer when destroyed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.</p>
+Note: <em class="parameter"><code>owner</code></em> should be <code class="literal">TRUE</code> if the stream should free the backend
+memory buffer when destroyed or <code class="literal">FALSE</code> otherwise.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -302,13 +294,9 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>owner</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if this stream should own the <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"
-><span class="type">GByteArray</span></a> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <code class="literal">TRUE</code> if this stream should own the <a
+href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.html#GByteArray"
+><span class="type">GByteArray</span></a> or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -471,11 +471,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> on EOS or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> on EOS or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-utils.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-utils.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-utils.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-utils.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -342,9 +342,7 @@
 <a name="g-mime-references-clear"></a><h3>g_mime_references_clear ()</h3>
 <pre class="programlisting">void                g_mime_references_clear             (<a class="link" href="gmime-gmime-utils.html#GMimeReferences" title="GMimeReferences">GMimeReferences</a> **refs);</pre>
 <p>
-Clears the <a class="link" href="gmime-gmime-utils.html#GMimeReferences" title="GMimeReferences"><span class="type">GMimeReferences</span></a> list and resets it to <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.</p>
+Clears the <a class="link" href="gmime-gmime-utils.html#GMimeReferences" title="GMimeReferences"><span class="type">GMimeReferences</span></a> list and resets it to <code class="literal">NULL</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -500,11 +498,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the text contains 8bit characters or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <code class="literal">TRUE</code> if the text contains 8bit characters or <code class="literal">FALSE</code>
 otherwise.
 </td>
 </tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -247,11 +247,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the requirement is met or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the requirement is met or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address-list.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address-list.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address-list.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address-list.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -275,12 +275,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the specified <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> was removed or
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the specified <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> was removed or
+<code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -313,11 +309,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if an <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> was removed or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <code class="literal">TRUE</code> if an <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> was removed or <code class="literal">FALSE</code>
 otherwise.
 </td>
 </tr>
@@ -351,12 +343,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the specified <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> is contained
-within the specified <a class="link" href="gmime-internet-address-list.html#InternetAddressList"><span class="type">InternetAddressList</span></a> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise.
+<td> <code class="literal">TRUE</code> if the specified <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> is contained
+within the specified <a class="link" href="gmime-internet-address-list.html#InternetAddressList"><span class="type">InternetAddressList</span></a> or <code class="literal">FALSE</code> otherwise.
 </td>
 </tr>
 </tbody>
@@ -419,9 +407,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> at the specified index or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if
+<td> the <a class="link" href="gmime-internet-address.html#InternetAddress"><span class="type">InternetAddress</span></a> at the specified index or <code class="literal">NULL</code> if
 the index is out of range.
 </td>
 </tr>
@@ -531,17 +517,13 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>encode</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the address should be rfc2047 encoded
+<td> <code class="literal">TRUE</code> if the address should be rfc2047 encoded
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a string containing the list of addresses in rfc822 format
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if no addresses are contained in the list.
+or <code class="literal">NULL</code> if no addresses are contained in the list.
 </td>
 </tr>
 </tbody>
@@ -566,9 +548,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a class="link" href="gmime-internet-address-list.html#InternetAddressList"><span class="type">InternetAddressList</span></a> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if the input string does
+<td> a <a class="link" href="gmime-internet-address-list.html#InternetAddressList"><span class="type">InternetAddressList</span></a> or <code class="literal">NULL</code> if the input string does
 not contain any addresses.
 </td>
 </tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-internet-address.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -168,9 +168,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>encode</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the address should be rfc2047 encoded
+<td> <code class="literal">TRUE</code> if the address should be rfc2047 encoded
 </td>
 </tr>
 <tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -45,22 +45,22 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" title="Questions and Answers">
-<a name="id2561324"></a><h2>Questions and Answers</h2>
+<a name="id2561200"></a><h2>Questions and Answers</h2>
 <p>This is an "index" of the reference manual
     organized by common "How do I..." questions. If you
     aren't sure which documentation to read for the question you have,
     this list is a good place to start.
     </p>
 <div class="qandaset" title="Frequently Asked Questions">
-<a name="id2561337"></a><table border="0" width="100%" summary="Q and A Set">
+<a name="id2561213"></a><table border="0" width="100%" summary="Q and A Set">
 <col align="left" width="1%">
 <col>
 <tbody>
 <tr class="qandadiv"><td align="left" valign="top" colspan="2"><h5 class="title">
-<a name="id2561339"></a>1. General</h5></td></tr>
+<a name="id2561215"></a>1. General</h5></td></tr>
 <tr class="question" title="1.1.">
 <td align="left" valign="top">
-<a name="id2561344"></a><a name="id2561346"></a><p><b>1.1.</b></p>
+<a name="id2561220"></a><a name="id2561223"></a><p><b>1.1.</b></p>
 </td>
 <td align="left" valign="top"><p>Where can I get help with GMime, submit a bug report, or make a feature request?</p></td>
 </tr>
@@ -71,7 +71,7 @@
 </tr>
 <tr class="question" title="1.2.">
 <td align="left" valign="top">
-<a name="id2561402"></a><a name="id2561404"></a><p><b>1.2.</b></p>
+<a name="id2561278"></a><a name="id2561281"></a><p><b>1.2.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I port from one GMime version to another?</p></td>
 </tr>
@@ -82,7 +82,7 @@
 </tr>
 <tr class="question" title="1.3.">
 <td align="left" valign="top">
-<a name="id2561426"></a><a name="id2561428"></a><p><b>1.3.</b></p>
+<a name="id2561302"></a><a name="id2561304"></a><p><b>1.3.</b></p>
 </td>
 <td align="left" valign="top"><p>How does memory management work in GMime? Should I free data returned from functions?</p></td>
 </tr>
@@ -102,7 +102,7 @@
 </tr>
 <tr class="question" title="1.4.">
 <td align="left" valign="top">
-<a name="id2561466"></a><a name="id2561468"></a><p><b>1.4.</b></p>
+<a name="id2561342"></a><a name="id2561344"></a><p><b>1.4.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I use GMime with threads?</p></td>
 </tr>
@@ -124,7 +124,7 @@
 </tr>
 <tr class="question" title="1.5.">
 <td align="left" valign="top">
-<a name="id2562197"></a><a name="id2562199"></a><p><b>1.5.</b></p>
+<a name="id2562073"></a><a name="id2562075"></a><p><b>1.5.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I use GMime with C++?</p></td>
 </tr>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -45,7 +45,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" title="Filing a bug report or feature request">
-<a name="id2560878"></a><h2>Filing a bug report or feature request</h2>
+<a name="id2560754"></a><h2>Filing a bug report or feature request</h2>
 <p>
 If you encounter a bug, misfeature, or missing feature in GMime, please
 file a bug report at 
@@ -61,7 +61,7 @@
 </p>
 </div>
 <div class="refsect1" title="Submitting Patches">
-<a name="id2560916"></a><h2>Submitting Patches</h2>
+<a name="id2560792"></a><h2>Submitting Patches</h2>
 <p>
 If you develop a bugfix or enhancement for GMime, please file that in
 Bugzilla as well. Bugzilla allows you to attach files; please attach a
@@ -81,7 +81,7 @@
 </p>
 </div>
 <div class="refsect1" title="Mailing lists">
-<a name="id2560962"></a><h2>Mailing lists</h2>
+<a name="id2560838"></a><h2>Mailing lists</h2>
 <p>There is currently only one mailing-list devoted to GMime
     itself which is for both the development of and development with
     GMime. You can subscribe to this list

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp [utf-8] Mon Mar 14 20:31:22 2011
@@ -72,8 +72,8 @@
         <sub name="GMimeMessage" link="gmime-gmime-message.html"/>
         <sub name="GMimePart" link="gmime-gmime-part.html"/>
         <sub name="GMimeMultipart" link="gmime-gmime-multipart.html"/>
-        <sub name="GMimeMultpartEncrypted" link="gmime-gmime-multipart-encrypted.html"/>
-        <sub name="GMimeMultpartSigned" link="gmime-gmime-multipart-signed.html"/>
+        <sub name="GMimeMultipartEncrypted" link="gmime-gmime-multipart-encrypted.html"/>
+        <sub name="GMimeMultipartSigned" link="gmime-gmime-multipart-signed.html"/>
         <sub name="GMimeMessagePart" link="gmime-gmime-message-part.html"/>
         <sub name="GMimeMessagePartial" link="gmime-gmime-message-partial.html"/>
       </sub>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2 [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2 [utf-8] Mon Mar 14 20:31:22 2011
@@ -72,8 +72,8 @@
         <sub name="GMimeMessage" link="gmime-gmime-message.html"/>
         <sub name="GMimePart" link="gmime-gmime-part.html"/>
         <sub name="GMimeMultipart" link="gmime-gmime-multipart.html"/>
-        <sub name="GMimeMultpartEncrypted" link="gmime-gmime-multipart-encrypted.html"/>
-        <sub name="GMimeMultpartSigned" link="gmime-gmime-multipart-signed.html"/>
+        <sub name="GMimeMultipartEncrypted" link="gmime-gmime-multipart-encrypted.html"/>
+        <sub name="GMimeMultipartSigned" link="gmime-gmime-multipart-signed.html"/>
         <sub name="GMimeMessagePart" link="gmime-gmime-message-part.html"/>
         <sub name="GMimeMessagePartial" link="gmime-gmime-message-partial.html"/>
       </sub>

Modified: packages/unstable/gmime2.4/docs/reference/html/index.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/index.html?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/index.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/index.html [utf-8] Mon Mar 14 20:31:22 2011
@@ -37,9 +37,9 @@
             <code class="email">&lt;<a class="email" href="mailto:fejj at gnome.org">fejj at gnome.org</a>&gt;</code><br>
           </p></div></div>
 </div></div></div>
-<div><p class="copyright">Copyright © 2000-2009 Jeffrey Stedfast</p></div>
+<div><p class="copyright">Copyright © 2000-2010 Jeffrey Stedfast</p></div>
 <div><div class="legalnotice" title="Legal Notice">
-<a name="id2549568"></a><p>
+<a name="id2549452"></a><p>
         This library is free software; you can redistribute it and/or
         modify it under the terms of the GNU Lesser General Public
         License as published by the Free Software Foundation; either
@@ -257,10 +257,10 @@
 <span class="refentrytitle"><a href="gmime-gmime-multipart.html">GMimeMultipart</a></span><span class="refpurpose"> — MIME multiparts</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="gmime-gmime-multipart-encrypted.html">GMimeMultpartEncrypted</a></span><span class="refpurpose"> — Encrypted MIME multiparts</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="gmime-gmime-multipart-signed.html">GMimeMultpartSigned</a></span><span class="refpurpose"> — Signed MIME multiparts</span>
+<span class="refentrytitle"><a href="gmime-gmime-multipart-encrypted.html">GMimeMultipartEncrypted</a></span><span class="refpurpose"> — Encrypted MIME multiparts</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="gmime-gmime-multipart-signed.html">GMimeMultipartSigned</a></span><span class="refpurpose"> — Signed MIME multiparts</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="gmime-gmime-message-part.html">GMimeMessagePart</a></span><span class="refpurpose"> — Message parts</span>

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml [utf-8] Mon Mar 14 20:31:22 2011
@@ -59,28 +59,28 @@
 <link linkend="GMimeSigner">GMimeSigner</link> *       <link linkend="g-mime-signer-new">g_mime_signer_new</link>                   (void);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-free">g_mime_signer_free</link>                  (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="GMimeSigner">GMimeSigner</link> *       <link linkend="g-mime-signer-next">g_mime_signer_next</link>                  (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
-<link linkend="GMimeSignerStatus">GMimeSignerStatus</link>   <link linkend="g-mime-signer-get-status">g_mime_signer_get_status</link>            (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+<link linkend="GMimeSignerStatus">GMimeSignerStatus</link>   <link linkend="g-mime-signer-get-status">g_mime_signer_get_status</link>            (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-status">g_mime_signer_set_status</link>            (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          <link linkend="GMimeSignerStatus">GMimeSignerStatus</link> status);
-<link linkend="GMimeSignerError">GMimeSignerError</link>    <link linkend="g-mime-signer-get-errors">g_mime_signer_get_errors</link>            (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+<link linkend="GMimeSignerError">GMimeSignerError</link>    <link linkend="g-mime-signer-get-errors">g_mime_signer_get_errors</link>            (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-errors">g_mime_signer_set_errors</link>            (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          <link linkend="GMimeSignerError">GMimeSignerError</link> error);
-<link linkend="GMimeSignerTrust">GMimeSignerTrust</link>    <link linkend="g-mime-signer-get-trust">g_mime_signer_get_trust</link>             (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+<link linkend="GMimeSignerTrust">GMimeSignerTrust</link>    <link linkend="g-mime-signer-get-trust">g_mime_signer_get_trust</link>             (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-trust">g_mime_signer_set_trust</link>             (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          <link linkend="GMimeSignerTrust">GMimeSignerTrust</link> trust);
-const <link linkend="char">char</link> *        <link linkend="g-mime-signer-get-fingerprint">g_mime_signer_get_fingerprint</link>       (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+const <link linkend="char">char</link> *        <link linkend="g-mime-signer-get-fingerprint">g_mime_signer_get_fingerprint</link>       (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-fingerprint">g_mime_signer_set_fingerprint</link>       (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          const <link linkend="char">char</link> *fingerprint);
-const <link linkend="char">char</link> *        <link linkend="g-mime-signer-get-key-id">g_mime_signer_get_key_id</link>            (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+const <link linkend="char">char</link> *        <link linkend="g-mime-signer-get-key-id">g_mime_signer_get_key_id</link>            (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-key-id">g_mime_signer_set_key_id</link>            (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          const <link linkend="char">char</link> *key_id);
-const <link linkend="char">char</link> *        <link linkend="g-mime-signer-get-name">g_mime_signer_get_name</link>              (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+const <link linkend="char">char</link> *        <link linkend="g-mime-signer-get-name">g_mime_signer_get_name</link>              (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-name">g_mime_signer_set_name</link>              (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          const <link linkend="char">char</link> *name);
-<link linkend="time-t">time_t</link>              <link linkend="g-mime-signer-get-created">g_mime_signer_get_created</link>           (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+<link linkend="time-t">time_t</link>              <link linkend="g-mime-signer-get-created">g_mime_signer_get_created</link>           (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-created">g_mime_signer_set_created</link>           (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          <link linkend="time-t">time_t</link> created);
-<link linkend="time-t">time_t</link>              <link linkend="g-mime-signer-get-expires">g_mime_signer_get_expires</link>           (<link linkend="GMimeSigner">GMimeSigner</link> *signer);
+<link linkend="time-t">time_t</link>              <link linkend="g-mime-signer-get-expires">g_mime_signer_get_expires</link>           (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);
 <link linkend="void">void</link>                <link linkend="g-mime-signer-set-expires">g_mime_signer_set_expires</link>           (<link linkend="GMimeSigner">GMimeSigner</link> *signer,
                                                          <link linkend="time-t">time_t</link> expires);
 <link linkend="GMimeSignatureValidity">GMimeSignatureValidity</link> * <link linkend="g-mime-signature-validity-new">g_mime_signature_validity_new</link>  (void);
@@ -707,7 +707,8 @@
 <title>g_mime_signer_free ()</title>
 <indexterm zone="g-mime-signer-free"><primary sortas="g_mime_signer_free">g_mime_signer_free</primary></indexterm><programlisting><link linkend="void">void</link>                g_mime_signer_free                  (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
-Free's the singleton signer.</para>
+Frees a singleton signer. Should NOT be used to free signers
+returned from <link linkend="g-mime-signature-validity-get-signers"><function>g_mime_signature_validity_get_signers()</function></link>.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>signer</parameter>&#160;:</term>
@@ -729,7 +730,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-status" role="function">
 <title>g_mime_signer_get_status ()</title>
-<indexterm zone="g-mime-signer-get-status"><primary sortas="g_mime_signer_get_status">g_mime_signer_get_status</primary></indexterm><programlisting><link linkend="GMimeSignerStatus">GMimeSignerStatus</link>   g_mime_signer_get_status            (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-status"><primary sortas="g_mime_signer_get_status">g_mime_signer_get_status</primary></indexterm><programlisting><link linkend="GMimeSignerStatus">GMimeSignerStatus</link>   g_mime_signer_get_status            (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the signer status.</para>
 <para>
@@ -757,7 +758,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-errors" role="function">
 <title>g_mime_signer_get_errors ()</title>
-<indexterm zone="g-mime-signer-get-errors"><primary sortas="g_mime_signer_get_errors">g_mime_signer_get_errors</primary></indexterm><programlisting><link linkend="GMimeSignerError">GMimeSignerError</link>    g_mime_signer_get_errors            (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-errors"><primary sortas="g_mime_signer_get_errors">g_mime_signer_get_errors</primary></indexterm><programlisting><link linkend="GMimeSignerError">GMimeSignerError</link>    g_mime_signer_get_errors            (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the signer errors.</para>
 <para>
@@ -785,7 +786,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-trust" role="function">
 <title>g_mime_signer_get_trust ()</title>
-<indexterm zone="g-mime-signer-get-trust"><primary sortas="g_mime_signer_get_trust">g_mime_signer_get_trust</primary></indexterm><programlisting><link linkend="GMimeSignerTrust">GMimeSignerTrust</link>    g_mime_signer_get_trust             (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-trust"><primary sortas="g_mime_signer_get_trust">g_mime_signer_get_trust</primary></indexterm><programlisting><link linkend="GMimeSignerTrust">GMimeSignerTrust</link>    g_mime_signer_get_trust             (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the signer trust.</para>
 <para>
@@ -813,7 +814,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-fingerprint" role="function">
 <title>g_mime_signer_get_fingerprint ()</title>
-<indexterm zone="g-mime-signer-get-fingerprint"><primary sortas="g_mime_signer_get_fingerprint">g_mime_signer_get_fingerprint</primary></indexterm><programlisting>const <link linkend="char">char</link> *        g_mime_signer_get_fingerprint       (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-fingerprint"><primary sortas="g_mime_signer_get_fingerprint">g_mime_signer_get_fingerprint</primary></indexterm><programlisting>const <link linkend="char">char</link> *        g_mime_signer_get_fingerprint       (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the signer's key fingerprint.</para>
 <para>
@@ -841,7 +842,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-key-id" role="function">
 <title>g_mime_signer_get_key_id ()</title>
-<indexterm zone="g-mime-signer-get-key-id"><primary sortas="g_mime_signer_get_key_id">g_mime_signer_get_key_id</primary></indexterm><programlisting>const <link linkend="char">char</link> *        g_mime_signer_get_key_id            (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-key-id"><primary sortas="g_mime_signer_get_key_id">g_mime_signer_get_key_id</primary></indexterm><programlisting>const <link linkend="char">char</link> *        g_mime_signer_get_key_id            (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the signer's key id.</para>
 <para>
@@ -869,7 +870,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-name" role="function">
 <title>g_mime_signer_get_name ()</title>
-<indexterm zone="g-mime-signer-get-name"><primary sortas="g_mime_signer_get_name">g_mime_signer_get_name</primary></indexterm><programlisting>const <link linkend="char">char</link> *        g_mime_signer_get_name              (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-name"><primary sortas="g_mime_signer_get_name">g_mime_signer_get_name</primary></indexterm><programlisting>const <link linkend="char">char</link> *        g_mime_signer_get_name              (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the signer's name.</para>
 <para>
@@ -897,7 +898,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-created" role="function">
 <title>g_mime_signer_get_created ()</title>
-<indexterm zone="g-mime-signer-get-created"><primary sortas="g_mime_signer_get_created">g_mime_signer_get_created</primary></indexterm><programlisting><link linkend="time-t">time_t</link>              g_mime_signer_get_created           (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-created"><primary sortas="g_mime_signer_get_created">g_mime_signer_get_created</primary></indexterm><programlisting><link linkend="time-t">time_t</link>              g_mime_signer_get_created           (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the creation date of the signer's key.</para>
 <para>
@@ -905,7 +906,7 @@
 <varlistentry><term><parameter>signer</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="GMimeSigner"><type>GMimeSigner</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the creation date of the signer's key.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the creation date of the signer's key or <link linkend="1--CAPS"><literal>-1</literal></link> if unknown.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-set-created" role="function">
@@ -925,7 +926,7 @@
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-get-expires" role="function">
 <title>g_mime_signer_get_expires ()</title>
-<indexterm zone="g-mime-signer-get-expires"><primary sortas="g_mime_signer_get_expires">g_mime_signer_get_expires</primary></indexterm><programlisting><link linkend="time-t">time_t</link>              g_mime_signer_get_expires           (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
+<indexterm zone="g-mime-signer-get-expires"><primary sortas="g_mime_signer_get_expires">g_mime_signer_get_expires</primary></indexterm><programlisting><link linkend="time-t">time_t</link>              g_mime_signer_get_expires           (const <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
 Get the expiration date of the signer's key.</para>
 <para>
@@ -933,7 +934,7 @@
 <varlistentry><term><parameter>signer</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="GMimeSigner"><type>GMimeSigner</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the expiration date of the signer's key.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the expiration date of the signer's key or <link linkend="1--CAPS"><literal>-1</literal></link> if unknown.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-set-expires" role="function">
@@ -1038,7 +1039,8 @@
                                                         (<link linkend="GMimeSignatureValidity">GMimeSignatureValidity</link> *validity,
                                                          <link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
-Adds <parameter>signer</parameter> to the list of signers on <parameter>validity</parameter>.</para>
+Adds <parameter>signer</parameter> to the list of signers on <parameter>validity</parameter>. Once the signer
+is added, it must NOT be freed.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>validity</parameter>&#160;:</term>
@@ -1060,7 +1062,8 @@
 <listitem><simpara> signature validity
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a <link linkend="GMimeSigner"><type>GMimeSigner</type></link> list which contain further information such
-as trust and cipher keys.
+as trust and cipher keys. These signers are part of the
+<link linkend="GMimeSignatureValidity"><type>GMimeSignatureValidity</type></link> and should NOT be freed individually.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-data-wrapper.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-data-wrapper.xml?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-data-wrapper.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-data-wrapper.xml [utf-8] Mon Mar 14 20:31:22 2011
@@ -125,8 +125,7 @@
 <varlistentry><term><parameter>wrapper</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="GMimeDataWrapper"><type>GMimeDataWrapper</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a reference to the internal stream. Caller is responsible
-for unrefing it.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a reference to the internal stream.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="g-mime-data-wrapper-set-encoding" role="function">

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-encodings.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-encodings.xml?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-encodings.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-encodings.xml [utf-8] Mon Mar 14 20:31:22 2011
@@ -488,7 +488,7 @@
 </para></refsect2>
 <refsect2 id="GMIME-UUENCODE-LEN--CAPS" role="macro">
 <title>GMIME_UUENCODE_LEN()</title>
-<indexterm zone="GMIME-UUENCODE-LEN--CAPS"><primary sortas="GMIME_UUENCODE_LEN">GMIME_UUENCODE_LEN</primary></indexterm><programlisting>#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 62))
+<indexterm zone="GMIME-UUENCODE-LEN--CAPS"><primary sortas="GMIME_UUENCODE_LEN">GMIME_UUENCODE_LEN</primary></indexterm><programlisting>#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 64))
 </programlisting>
 <para>
 Calculates the maximum number of bytes needed to uuencode the full
@@ -602,7 +602,7 @@
 </variablelist></refsect2>
 <refsect2 id="GMIME-QP-ENCODE-LEN--CAPS" role="macro">
 <title>GMIME_QP_ENCODE_LEN()</title>
-<indexterm zone="GMIME-QP-ENCODE-LEN--CAPS"><primary sortas="GMIME_QP_ENCODE_LEN">GMIME_QP_ENCODE_LEN</primary></indexterm><programlisting>#define GMIME_QP_ENCODE_LEN(x)     ((size_t) ((((x) + 1) * 3) + 1))
+<indexterm zone="GMIME-QP-ENCODE-LEN--CAPS"><primary sortas="GMIME_QP_ENCODE_LEN">GMIME_QP_ENCODE_LEN</primary></indexterm><programlisting>#define GMIME_QP_ENCODE_LEN(x)     ((size_t) ((((x) / 24) * 74) + 74))
 </programlisting>
 <para>
 Calculates the maximum number of bytes needed to encode the full

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-encrypted.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-encrypted.xml?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-encrypted.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-encrypted.xml [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,12 +1,12 @@
 <refentry id="gmime-gmime-multipart-encrypted">
 <refmeta>
-<refentrytitle role="top_of_page" id="gmime-gmime-multipart-encrypted.top_of_page">GMimeMultpartEncrypted</refentrytitle>
+<refentrytitle role="top_of_page" id="gmime-gmime-multipart-encrypted.top_of_page">GMimeMultipartEncrypted</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GMIME Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>GMimeMultpartEncrypted</refname>
+<refname>GMimeMultipartEncrypted</refname>
 <refpurpose>Encrypted MIME multiparts</refpurpose>
 </refnamediv>
 
@@ -103,7 +103,7 @@
 <listitem><simpara> MIME part to encrypt
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara> encryption cipher context
+<listitem><simpara> encryption context
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>sign</parameter>&#160;:</term>
 <listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the content should also be signed or <link linkend="FALSE--CAPS"><literal>FALSE</literal></link> otherwise
@@ -129,26 +129,30 @@
                                                          <link linkend="GError">GError</link> **err);</programlisting>
 <para>
 Attempts to decrypt the encrypted MIME part contained within the
-multipart/encrypted object <parameter>mpe</parameter> using the <parameter>ctx</parameter> decryption context.
+multipart/encrypted object <parameter>mpe</parameter> using the <parameter>ctx</parameter> decryption
+context.
 </para>
 <para>
-If <parameter>validity</parameter> is non-NULL, then on a successful decrypt operation,
-it will be updated to point to a newly-allocated
-<link linkend="GMimeSignatureValidity"><type>GMimeSignatureValidity</type></link> with signature status information.</para>
+For information regarding the signature status (in cases where the
+MIME part was both encrypted and signed), you may wish to check the
+results of <link linkend="g-mime-multipart-encrypted-get-signature-validity"><function>g_mime_multipart_encrypted_get_signature_validity()</function></link>.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>mpe</parameter>&#160;:</term>
 <listitem><simpara> multipart/encrypted object
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara> decryption cipher context
+<listitem><simpara> decryption context
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>err</parameter>&#160;:</term>
 <listitem><simpara> a <link linkend="GError"><type>GError</type></link>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the decrypted MIME part on success or <link linkend="NULL--CAPS"><literal>NULL</literal></link> on fail. If the
-decryption fails, an exception will be set on <parameter>err</parameter> to provide
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the decrypted MIME part on success or <link linkend="NULL--CAPS"><literal>NULL</literal></link> on fail. If
+the decryption fails, an exception will be set on <parameter>err</parameter> to provide
 information as to why the failure occured.
+
+Note: On success, the decrypted MIME part is cached internally and
+so the returned <link linkend="GMimeObject"><type>GMimeObject</type></link> must NOT be unreffed.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="g-mime-multipart-encrypted-get-signature-validity" role="function">

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-signed.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-signed.xml?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-signed.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-multipart-signed.xml [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,12 +1,12 @@
 <refentry id="gmime-gmime-multipart-signed">
 <refmeta>
-<refentrytitle role="top_of_page" id="gmime-gmime-multipart-signed.top_of_page">GMimeMultpartSigned</refentrytitle>
+<refentrytitle role="top_of_page" id="gmime-gmime-multipart-signed.top_of_page">GMimeMultipartSigned</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GMIME Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>GMimeMultpartSigned</refname>
+<refname>GMimeMultipartSigned</refname>
 <refpurpose>Signed MIME multiparts</refpurpose>
 </refnamediv>
 

Modified: packages/unstable/gmime2.4/docs/tutorial/gmime-tut.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/tutorial/gmime-tut.sgml?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/tutorial/gmime-tut.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/tutorial/gmime-tut.sgml [utf-8] Mon Mar 14 20:31:22 2011
@@ -5,15 +5,15 @@
 <book id="gmime-tut">
 
   <bookinfo>
-    <title>GMime 2.0 tutorial</title>
-    <date>May 18, 2003</date>
+    <title>GMime 2.4 tutorial</title>
+    <date>Oct 28, 2010</date>
     <authorgroup>
       <author>
 	<firstname>Jeffrey</firstname>
 	<surname>Stedfast</surname>
 	<affiliation>
 	  <address>
-          <email>fejj at ximian.com</email>
+          <email>fejj at gnome.org</email>
         </address>
 	</affiliation>
       </author>
@@ -56,7 +56,7 @@
     
     <itemizedlist>
       <listitem>
-	<simpara>Jeffrey Stedfast <ulink url="mailto:fejj at ximian.com">fejj at gnome.org</ulink></simpara>
+	<simpara>Jeffrey Stedfast <ulink url="mailto:fejj at gnome.org">fejj at gnome.org</ulink></simpara>
       </listitem>
     </itemizedlist>
     
@@ -659,8 +659,6 @@
 	content = g_mime_part_get_content_object (part);
 	g_mime_data_wrapper_write_to_stream (content, stream);
 	g_mime_stream_flush (stream);
-	
-	g_object_unref (content);
 	g_object_unref (stream);
 }
       </programlisting>
@@ -672,9 +670,9 @@
       <literal>g_mime_data_wrapper_write_to_stream()</literal>. On
       fail, this function will return <literal>-1</literal>, otherwise
       it will return some positive value which will usually equate to
-      the number of bytes written (but not always); generally it's a
-      good idea to not rely on the returned value for anything other
-      than error-checking.</para>
+      the number of bytes written (but not always, due to filter
+      transformations); generally it's a good idea to not rely on the
+      returned value for anything other than error-checking.</para>
       
     </sect1>
     

Modified: packages/unstable/gmime2.4/examples/basic-example.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/examples/basic-example.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/examples/basic-example.c [utf-8] (original)
+++ packages/unstable/gmime2.4/examples/basic-example.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -363,6 +363,7 @@
 	count_parts_in_message (message);
 	
 #ifndef G_OS_WIN32
+#ifdef ENABLE_CRYPTOGRAPHY
 	/* create our cipher context (and session - which is used by the context to query the user) */
 	session = g_object_new (example_session_get_type (), NULL);
 	ctx = g_mime_gpg_context_new (session, path);
@@ -375,6 +376,7 @@
 	verify_signed_parts (message, ctx);
 	g_object_unref (ctx);
 #endif
+#endif
 	
 	/* add and remove parts */
 	add_a_mime_part (message);

Modified: packages/unstable/gmime2.4/examples/imap-example.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/examples/imap-example.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/examples/imap-example.c [utf-8] (original)
+++ packages/unstable/gmime2.4/examples/imap-example.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/gmime.spec
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime.spec?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime.spec [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime.spec [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      2.4.14
+%define ver      2.4.23
 %define prefix   /usr
 %define enable_mono 0
 %define enable_gtk_doc 0

Modified: packages/unstable/gmime2.4/gmime/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/Makefile.am?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/Makefile.am [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/Makefile.am [utf-8] Mon Mar 14 20:31:22 2011
@@ -44,7 +44,6 @@
 	gmime-filter-strip.c		\
 	gmime-filter-windows.c		\
 	gmime-filter-yenc.c		\
-	gmime-gpg-context.c		\
 	gmime-header.c			\
 	gmime-iconv.c			\
 	gmime-iconv-utils.c		\
@@ -73,6 +72,11 @@
 	gmime-utils.c			\
 	internet-address.c
 
+if ENABLE_CRYPTOGRAPHY
+libgmime_2_4_la_SOURCES += 		\
+	gmime-gpg-context.c
+endif
+
 gmimeinclude_HEADERS = 			\
 	gmime.h				\
 	gmime-charset.h			\
@@ -95,7 +99,6 @@
 	gmime-filter-strip.h		\
 	gmime-filter-windows.h		\
 	gmime-filter-yenc.h		\
-	gmime-gpg-context.h		\
 	gmime-header.h			\
 	gmime-iconv.h			\
 	gmime-iconv-utils.h		\
@@ -123,6 +126,11 @@
 	gmime-stream-null.h		\
 	gmime-utils.h			\
 	internet-address.h
+
+if ENABLE_CRYPTOGRAPHY
+gmimeinclude_HEADERS +=			\
+	gmime-gpg-context.h
+endif
 
 noinst_HEADERS = 			\
 	gmime-common.h			\

Modified: packages/unstable/gmime2.4/gmime/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/Makefile.in?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/Makefile.in [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/Makefile.in [utf-8] Mon Mar 14 20:31:22 2011
@@ -37,8 +37,14 @@
 build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = gen-table$(EXEEXT) charset-map$(EXEEXT)
+ at ENABLE_CRYPTOGRAPHY_TRUE@am__append_1 = \
+ at ENABLE_CRYPTOGRAPHY_TRUE@	gmime-gpg-context.c
+
+ at ENABLE_CRYPTOGRAPHY_TRUE@am__append_2 = \
+ at ENABLE_CRYPTOGRAPHY_TRUE@	gmime-gpg-context.h
+
 subdir = gmime
-DIST_COMMON = $(gmimeinclude_HEADERS) $(noinst_HEADERS) \
+DIST_COMMON = $(am__gmimeinclude_HEADERS_DIST) $(noinst_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -75,6 +81,26 @@
 am__DEPENDENCIES_1 =
 libgmime_2_4_la_DEPENDENCIES = $(top_builddir)/util/libutil.la \
 	$(am__DEPENDENCIES_1)
+am__libgmime_2_4_la_SOURCES_DIST = gmime.c gmime-charset.c \
+	gmime-cipher-context.c gmime-common.c gmime-content-type.c \
+	gmime-data-wrapper.c gmime-disposition.c gmime-encodings.c \
+	gmime-filter.c gmime-filter-basic.c gmime-filter-best.c \
+	gmime-filter-charset.c gmime-filter-crlf.c \
+	gmime-filter-enriched.c gmime-filter-from.c \
+	gmime-filter-gzip.c gmime-filter-html.c gmime-filter-md5.c \
+	gmime-filter-strip.c gmime-filter-windows.c \
+	gmime-filter-yenc.c gmime-header.c gmime-iconv.c \
+	gmime-iconv-utils.c gmime-message.c gmime-message-part.c \
+	gmime-message-partial.c gmime-multipart.c \
+	gmime-multipart-encrypted.c gmime-multipart-signed.c \
+	gmime-object.c gmime-param.c gmime-parse-utils.c \
+	gmime-parser.c gmime-part.c gmime-session.c \
+	gmime-session-simple.c gmime-stream.c gmime-stream-buffer.c \
+	gmime-stream-cat.c gmime-stream-file.c gmime-stream-filter.c \
+	gmime-stream-fs.c gmime-stream-mem.c gmime-stream-mmap.c \
+	gmime-stream-null.c gmime-utils.c internet-address.c \
+	gmime-gpg-context.c
+ at ENABLE_CRYPTOGRAPHY_TRUE@am__objects_1 = gmime-gpg-context.lo
 am_libgmime_2_4_la_OBJECTS = gmime.lo gmime-charset.lo \
 	gmime-cipher-context.lo gmime-common.lo gmime-content-type.lo \
 	gmime-data-wrapper.lo gmime-disposition.lo gmime-encodings.lo \
@@ -83,17 +109,17 @@
 	gmime-filter-enriched.lo gmime-filter-from.lo \
 	gmime-filter-gzip.lo gmime-filter-html.lo gmime-filter-md5.lo \
 	gmime-filter-strip.lo gmime-filter-windows.lo \
-	gmime-filter-yenc.lo gmime-gpg-context.lo gmime-header.lo \
-	gmime-iconv.lo gmime-iconv-utils.lo gmime-message.lo \
-	gmime-message-part.lo gmime-message-partial.lo \
-	gmime-multipart.lo gmime-multipart-encrypted.lo \
-	gmime-multipart-signed.lo gmime-object.lo gmime-param.lo \
-	gmime-parse-utils.lo gmime-parser.lo gmime-part.lo \
-	gmime-session.lo gmime-session-simple.lo gmime-stream.lo \
-	gmime-stream-buffer.lo gmime-stream-cat.lo \
-	gmime-stream-file.lo gmime-stream-filter.lo gmime-stream-fs.lo \
-	gmime-stream-mem.lo gmime-stream-mmap.lo gmime-stream-null.lo \
-	gmime-utils.lo internet-address.lo
+	gmime-filter-yenc.lo gmime-header.lo gmime-iconv.lo \
+	gmime-iconv-utils.lo gmime-message.lo gmime-message-part.lo \
+	gmime-message-partial.lo gmime-multipart.lo \
+	gmime-multipart-encrypted.lo gmime-multipart-signed.lo \
+	gmime-object.lo gmime-param.lo gmime-parse-utils.lo \
+	gmime-parser.lo gmime-part.lo gmime-session.lo \
+	gmime-session-simple.lo gmime-stream.lo gmime-stream-buffer.lo \
+	gmime-stream-cat.lo gmime-stream-file.lo \
+	gmime-stream-filter.lo gmime-stream-fs.lo gmime-stream-mem.lo \
+	gmime-stream-mmap.lo gmime-stream-null.lo gmime-utils.lo \
+	internet-address.lo $(am__objects_1)
 libgmime_2_4_la_OBJECTS = $(am_libgmime_2_4_la_OBJECTS)
 libgmime_2_4_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -121,8 +147,8 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libgmime_2_4_la_SOURCES) $(charset_map_SOURCES) \
 	$(gen_table_SOURCES)
-DIST_SOURCES = $(libgmime_2_4_la_SOURCES) $(charset_map_SOURCES) \
-	$(gen_table_SOURCES)
+DIST_SOURCES = $(am__libgmime_2_4_la_SOURCES_DIST) \
+	$(charset_map_SOURCES) $(gen_table_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -130,6 +156,25 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__gmimeinclude_HEADERS_DIST = gmime.h gmime-charset.h \
+	gmime-cipher-context.h gmime-content-type.h \
+	gmime-data-wrapper.h gmime-disposition.h gmime-encodings.h \
+	gmime-error.h gmime-filter.h gmime-filter-basic.h \
+	gmime-filter-best.h gmime-filter-charset.h gmime-filter-crlf.h \
+	gmime-filter-enriched.h gmime-filter-from.h \
+	gmime-filter-gzip.h gmime-filter-html.h gmime-filter-md5.h \
+	gmime-filter-strip.h gmime-filter-windows.h \
+	gmime-filter-yenc.h gmime-header.h gmime-iconv.h \
+	gmime-iconv-utils.h gmime-message.h gmime-message-part.h \
+	gmime-message-partial.h gmime-multipart.h \
+	gmime-multipart-encrypted.h gmime-multipart-signed.h \
+	gmime-object.h gmime-param.h gmime-parse-utils.h \
+	gmime-parser.h gmime-part.h gmime-session.h \
+	gmime-session-simple.h gmime-stream.h gmime-stream-buffer.h \
+	gmime-stream-cat.h gmime-stream-file.h gmime-stream-filter.h \
+	gmime-stream-fs.h gmime-stream-mem.h gmime-stream-mmap.h \
+	gmime-stream-null.h gmime-utils.h internet-address.h \
+	gmime-gpg-context.h
 HEADERS = $(gmimeinclude_HEADERS) $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -331,108 +376,44 @@
 		-DGMIME_MICRO_VERSION=$(GMIME_MICRO_VERSION)
 
 lib_LTLIBRARIES = libgmime-2.4.la
-libgmime_2_4_la_SOURCES = \
-	gmime.c				\
-	gmime-charset.c			\
-	gmime-cipher-context.c		\
-	gmime-common.c			\
-	gmime-content-type.c		\
-	gmime-data-wrapper.c		\
-	gmime-disposition.c		\
-	gmime-encodings.c		\
-	gmime-filter.c			\
-	gmime-filter-basic.c		\
-	gmime-filter-best.c		\
-	gmime-filter-charset.c		\
-	gmime-filter-crlf.c		\
-	gmime-filter-enriched.c		\
-	gmime-filter-from.c		\
-	gmime-filter-gzip.c		\
-	gmime-filter-html.c		\
-	gmime-filter-md5.c		\
-	gmime-filter-strip.c		\
-	gmime-filter-windows.c		\
-	gmime-filter-yenc.c		\
-	gmime-gpg-context.c		\
-	gmime-header.c			\
-	gmime-iconv.c			\
-	gmime-iconv-utils.c		\
-	gmime-message.c			\
-	gmime-message-part.c		\
-	gmime-message-partial.c		\
-	gmime-multipart.c		\
-	gmime-multipart-encrypted.c	\
-	gmime-multipart-signed.c	\
-	gmime-object.c			\
-	gmime-param.c			\
-	gmime-parse-utils.c		\
-	gmime-parser.c			\
-	gmime-part.c			\
-	gmime-session.c			\
-	gmime-session-simple.c		\
-	gmime-stream.c			\
-	gmime-stream-buffer.c		\
-	gmime-stream-cat.c		\
-	gmime-stream-file.c		\
-	gmime-stream-filter.c		\
-	gmime-stream-fs.c		\
-	gmime-stream-mem.c		\
-	gmime-stream-mmap.c		\
-	gmime-stream-null.c		\
-	gmime-utils.c			\
-	internet-address.c
-
-gmimeinclude_HEADERS = \
-	gmime.h				\
-	gmime-charset.h			\
-	gmime-cipher-context.h		\
-	gmime-content-type.h		\
-	gmime-data-wrapper.h		\
-	gmime-disposition.h		\
-	gmime-encodings.h		\
-	gmime-error.h			\
-	gmime-filter.h			\
-	gmime-filter-basic.h		\
-	gmime-filter-best.h		\
-	gmime-filter-charset.h		\
-	gmime-filter-crlf.h		\
-	gmime-filter-enriched.h		\
-	gmime-filter-from.h		\
-	gmime-filter-gzip.h		\
-	gmime-filter-html.h		\
-	gmime-filter-md5.h		\
-	gmime-filter-strip.h		\
-	gmime-filter-windows.h		\
-	gmime-filter-yenc.h		\
-	gmime-gpg-context.h		\
-	gmime-header.h			\
-	gmime-iconv.h			\
-	gmime-iconv-utils.h		\
-	gmime-message.h			\
-	gmime-message-part.h		\
-	gmime-message-partial.h		\
-	gmime-multipart.h		\
-	gmime-multipart-encrypted.h	\
-	gmime-multipart-signed.h	\
-	gmime-object.h			\
-	gmime-param.h			\
-	gmime-parse-utils.h		\
-	gmime-parser.h			\
-	gmime-part.h			\
-	gmime-session.h			\
-	gmime-session-simple.h		\
-	gmime-stream.h			\
-	gmime-stream-buffer.h		\
-	gmime-stream-cat.h		\
-	gmime-stream-file.h		\
-	gmime-stream-filter.h		\
-	gmime-stream-fs.h		\
-	gmime-stream-mem.h		\
-	gmime-stream-mmap.h		\
-	gmime-stream-null.h		\
-	gmime-utils.h			\
-	internet-address.h
-
+libgmime_2_4_la_SOURCES = gmime.c gmime-charset.c \
+	gmime-cipher-context.c gmime-common.c gmime-content-type.c \
+	gmime-data-wrapper.c gmime-disposition.c gmime-encodings.c \
+	gmime-filter.c gmime-filter-basic.c gmime-filter-best.c \
+	gmime-filter-charset.c gmime-filter-crlf.c \
+	gmime-filter-enriched.c gmime-filter-from.c \
+	gmime-filter-gzip.c gmime-filter-html.c gmime-filter-md5.c \
+	gmime-filter-strip.c gmime-filter-windows.c \
+	gmime-filter-yenc.c gmime-header.c gmime-iconv.c \
+	gmime-iconv-utils.c gmime-message.c gmime-message-part.c \
+	gmime-message-partial.c gmime-multipart.c \
+	gmime-multipart-encrypted.c gmime-multipart-signed.c \
+	gmime-object.c gmime-param.c gmime-parse-utils.c \
+	gmime-parser.c gmime-part.c gmime-session.c \
+	gmime-session-simple.c gmime-stream.c gmime-stream-buffer.c \
+	gmime-stream-cat.c gmime-stream-file.c gmime-stream-filter.c \
+	gmime-stream-fs.c gmime-stream-mem.c gmime-stream-mmap.c \
+	gmime-stream-null.c gmime-utils.c internet-address.c \
+	$(am__append_1)
+gmimeinclude_HEADERS = gmime.h gmime-charset.h gmime-cipher-context.h \
+	gmime-content-type.h gmime-data-wrapper.h gmime-disposition.h \
+	gmime-encodings.h gmime-error.h gmime-filter.h \
+	gmime-filter-basic.h gmime-filter-best.h \
+	gmime-filter-charset.h gmime-filter-crlf.h \
+	gmime-filter-enriched.h gmime-filter-from.h \
+	gmime-filter-gzip.h gmime-filter-html.h gmime-filter-md5.h \
+	gmime-filter-strip.h gmime-filter-windows.h \
+	gmime-filter-yenc.h gmime-header.h gmime-iconv.h \
+	gmime-iconv-utils.h gmime-message.h gmime-message-part.h \
+	gmime-message-partial.h gmime-multipart.h \
+	gmime-multipart-encrypted.h gmime-multipart-signed.h \
+	gmime-object.h gmime-param.h gmime-parse-utils.h \
+	gmime-parser.h gmime-part.h gmime-session.h \
+	gmime-session-simple.h gmime-stream.h gmime-stream-buffer.h \
+	gmime-stream-cat.h gmime-stream-file.h gmime-stream-filter.h \
+	gmime-stream-fs.h gmime-stream-mem.h gmime-stream-mmap.h \
+	gmime-stream-null.h gmime-utils.h internet-address.h \
+	$(am__append_2)
 noinst_HEADERS = \
 	gmime-common.h			\
 	gmime-table-private.h		\

Modified: packages/unstable/gmime2.4/gmime/charset-map.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/charset-map.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/charset-map.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/charset-map.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -74,7 +74,6 @@
 	{ "Shift-JIS",    1, 0 },  /* Japanese as used by Windows and MacOS systems */
 	{ "euc-jp",       1, 0 },  /* Japanese traditionally used on Unix systems */
 	{ "euc-kr",       1, 0 },  /* Korean */
-	{ "iso-2022-kr",  1, 0 },  /* Korean (less popular than euc-kr) */
 	{ "gb2312",       1, 0 },  /* Simplified Chinese */
 	{ "Big5",         1, 0 },  /* Traditional Chinese */
 	{ "euc-tw",       1, 0 },

Modified: packages/unstable/gmime2.4/gmime/gen-table.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gen-table.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gen-table.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gen-table.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-charset-map-private.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-charset-map-private.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-charset-map-private.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-charset-map-private.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -71,38 +71,38 @@
 };
 
 static unsigned char m002[256] = {
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
 };
 
 static unsigned char m010[256] = {
@@ -628,75 +628,75 @@
 #define m1d1 m1c1
 
 static unsigned char m1d2[256] = {
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 #define m1e1 m1c1
 
 static unsigned char m1e2[256] = {
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 #define m1f1 m1c1
@@ -774,38 +774,38 @@
 };
 
 static unsigned char m202[256] = {
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0f, 0x0f, 0x0d, 
-	0x0f, 0x0f, 0x0d, 0x0d, 0x0f, 0x0f, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0d, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m210[256] = {
@@ -879,38 +879,38 @@
 };
 
 static unsigned char m212[256] = {
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m220[256] = {
@@ -984,38 +984,38 @@
 };
 
 static unsigned char m222[256] = {
-	0x0d, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0f, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x0e, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0e, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m230[256] = {
@@ -1089,38 +1089,38 @@
 };
 
 static unsigned char m232[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m241[256] = {
@@ -1159,38 +1159,38 @@
 };
 
 static unsigned char m242[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m250[256] = {
@@ -1264,38 +1264,38 @@
 };
 
 static unsigned char m252[256] = {
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 
-	0x0d, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m261[256] = {
@@ -1334,38 +1334,38 @@
 };
 
 static unsigned char m262[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m271[256] = {
@@ -1403,72 +1403,39 @@
 	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
 };
 
-static unsigned char m272[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-};
+#define m272 m1e2
 
 #define m281 m271
 
-#define m282 m272
+#define m282 m1e2
 
 #define m291 m271
 
-#define m292 m272
+#define m292 m1e2
 
 #define m2a1 m271
 
-#define m2a2 m272
+#define m2a2 m1e2
 
 #define m2b1 m271
 
-#define m2b2 m272
+#define m2b2 m1e2
 
 #define m2c1 m271
 
-#define m2c2 m272
+#define m2c2 m1e2
 
 #define m2d1 m271
 
-#define m2d2 m272
+#define m2d2 m1e2
 
 #define m2e1 m271
 
-#define m2e2 m272
+#define m2e2 m1e2
 
 #define m2f1 m271
 
-#define m2f2 m272
+#define m2f2 m1e2
 
 static unsigned char m301[256] = {
 	0xf0, 0xf0, 0xf0, 0xf0, 0x40, 0x70, 0x70, 0x70, 
@@ -1506,38 +1473,38 @@
 };
 
 static unsigned char m302[256] = {
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m311[256] = {
@@ -1576,38 +1543,38 @@
 };
 
 static unsigned char m312[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m321[256] = {
@@ -1646,38 +1613,38 @@
 };
 
 static unsigned char m322[256] = {
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m331[256] = {
@@ -1715,113 +1682,80 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char m332[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-};
-
-#define m342 m272
-
-#define m352 m272
+#define m332 m1e2
+
+#define m342 m1e2
+
+#define m352 m1e2
 
 static unsigned char m362[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
 };
 
 static unsigned char m372[256] = {
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
 };
 
 #define m382 m372
@@ -1904,38 +1838,38 @@
 };
 
 static unsigned char m4e2[256] = {
-	0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x08, 0x08, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0f, 0x0e, 0x0c, 
-	0x0e, 0x0f, 0x08, 0x0a, 0x0f, 0x0f, 0x0f, 0x08, 
-	0x0f, 0x0f, 0x0a, 0x0a, 0x0a, 0x0a, 0x0f, 0x0c, 
-	0x08, 0x08, 0x0a, 0x08, 0x0a, 0x0a, 0x0c, 0x0a, 
-	0x0a, 0x08, 0x0a, 0x0e, 0x0a, 0x0f, 0x0c, 0x08, 
-	0x0e, 0x0c, 0x0f, 0x0c, 0x0a, 0x08, 0x0a, 0x08, 
-	0x0f, 0x0f, 0x0a, 0x0f, 0x0c, 0x0a, 0x0a, 0x0a, 
-	0x08, 0x08, 0x0d, 0x0f, 0x08, 0x0f, 0x08, 0x0e, 
-	0x0e, 0x0a, 0x08, 0x0f, 0x0a, 0x0f, 0x0f, 0x0f, 
-	0x0a, 0x08, 0x0e, 0x0e, 0x0a, 0x08, 0x0f, 0x08, 
-	0x0f, 0x0f, 0x08, 0x08, 0x0e, 0x0f, 0x0f, 0x0f, 
-	0x0a, 0x0a, 0x08, 0x08, 0x08, 0x08, 0x0a, 0x08, 
-	0x08, 0x0e, 0x08, 0x09, 0x08, 0x09, 0x08, 0x08, 
-	0x0a, 0x0a, 0x08, 0x0f, 0x08, 0x08, 0x09, 0x09, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0f, 0x0c, 
-	0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x0f, 0x08, 
-	0x0f, 0x0a, 0x08, 0x0f, 0x0f, 0x0e, 0x0f, 0x0a, 
-	0x09, 0x0f, 0x0f, 0x0e, 0x0f, 0x0f, 0x08, 0x08, 
-	0x0b, 0x0c, 0x0a, 0x0f, 0x08, 0x08, 0x0d, 0x0e, 
-	0x0a, 0x0f, 0x0f, 0x08, 0x0f, 0x0f, 0x0f, 0x0a, 
-	0x0f, 0x0a, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 
-	0x08, 0x08, 0x0a, 0x0e, 0x08, 0x0a, 0x0d, 0x08, 
-	0x08, 0x0c, 0x0f, 0x0a, 0x08, 0x08, 0x08, 0x0a, 
-	0x0f, 0x0f, 0x0e, 0x0e, 0x0f, 0x0a, 0x0e, 0x0f, 
-	0x0c, 0x0e, 0x0f, 0x0f, 0x08, 0x0f, 0x0a, 0x08, 
-	0x08, 0x0a, 0x08, 0x0a, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x08, 0x0c, 0x0f, 0x0e, 0x0f, 
-	0x08, 0x0e, 0x08, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 
-	0x0e, 0x0c, 0x0a, 0x0a, 0x0a, 0x08, 0x08, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x0e, 0x0c, 0x0e, 0x0f, 0x0f, 
-	0x08, 0x08, 0x08, 0x0f, 0x08, 0x0e, 0x08, 0x0e, 
+	0x07, 0x07, 0x04, 0x07, 0x04, 0x04, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x05, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x07, 0x05, 0x05, 0x05, 0x05, 0x07, 0x06, 
+	0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x06, 0x05, 
+	0x05, 0x04, 0x05, 0x07, 0x05, 0x07, 0x06, 0x04, 
+	0x07, 0x06, 0x07, 0x06, 0x05, 0x04, 0x05, 0x04, 
+	0x07, 0x07, 0x05, 0x07, 0x06, 0x05, 0x05, 0x05, 
+	0x04, 0x04, 0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 
+	0x07, 0x05, 0x04, 0x07, 0x05, 0x07, 0x07, 0x07, 
+	0x05, 0x04, 0x07, 0x07, 0x05, 0x04, 0x07, 0x04, 
+	0x07, 0x07, 0x04, 0x04, 0x07, 0x07, 0x07, 0x07, 
+	0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 
+	0x04, 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x05, 0x05, 0x04, 0x07, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x07, 0x04, 
+	0x07, 0x05, 0x04, 0x07, 0x07, 0x07, 0x07, 0x05, 
+	0x04, 0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 0x04, 
+	0x05, 0x06, 0x05, 0x07, 0x04, 0x04, 0x06, 0x07, 
+	0x05, 0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 0x05, 
+	0x07, 0x05, 0x04, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x04, 0x04, 0x05, 0x07, 0x04, 0x05, 0x06, 0x04, 
+	0x04, 0x06, 0x07, 0x05, 0x04, 0x04, 0x04, 0x05, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x07, 0x07, 
+	0x06, 0x07, 0x07, 0x07, 0x04, 0x07, 0x05, 0x04, 
+	0x04, 0x05, 0x04, 0x05, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x04, 0x07, 0x04, 0x07, 0x07, 0x07, 0x04, 0x04, 
+	0x07, 0x06, 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x04, 0x04, 0x04, 0x07, 0x04, 0x07, 0x04, 0x07, 
 };
 
 static unsigned char m4f1[256] = {
@@ -1974,38 +1908,38 @@
 };
 
 static unsigned char m4f2[256] = {
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0f, 0x0f, 0x0d, 0x08, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0a, 
-	0x0e, 0x0e, 0x0a, 0x0a, 0x08, 0x0c, 0x0a, 0x0a, 
-	0x0a, 0x08, 0x0e, 0x08, 0x0a, 0x0a, 0x0a, 0x0a, 
-	0x08, 0x08, 0x0a, 0x0a, 0x0c, 0x0c, 0x08, 0x0f, 
-	0x0e, 0x08, 0x0a, 0x0c, 0x0f, 0x08, 0x0f, 0x08, 
-	0x0f, 0x08, 0x0f, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0f, 0x08, 0x08, 0x0f, 0x0d, 
-	0x0d, 0x0c, 0x08, 0x08, 0x0c, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0e, 0x0c, 0x0f, 0x0c, 0x0e, 
-	0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 
-	0x0e, 0x0c, 0x0c, 0x0e, 0x0e, 0x0a, 0x08, 0x0e, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x08, 0x0f, 0x0e, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0e, 0x0e, 0x0c, 0x0f, 0x0f, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x0f, 0x0c, 0x0d, 0x0c, 
-	0x0f, 0x0e, 0x09, 0x0f, 0x08, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0e, 0x0c, 0x0d, 0x0e, 
-	0x0d, 0x08, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0a, 0x08, 0x08, 0x0a, 0x08, 0x0a, 0x0a, 0x0a, 
-	0x0a, 0x0a, 0x0a, 0x08, 0x0a, 0x08, 0x0f, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0f, 
-	0x0c, 0x0c, 0x0d, 0x0f, 0x0f, 0x0e, 0x08, 0x0c, 
-	0x08, 0x0d, 0x0f, 0x0c, 0x08, 0x0c, 0x0f, 0x0e, 
-	0x0e, 0x0f, 0x08, 0x0d, 0x0d, 0x08, 0x0c, 0x0f, 
-	0x0e, 0x0c, 0x0f, 0x0c, 0x0e, 0x0f, 0x0e, 0x0f, 
-	0x0d, 0x0f, 0x08, 0x0a, 0x08, 0x08, 0x0a, 0x08, 
-	0x0a, 0x0a, 0x0a, 0x08, 0x0c, 0x0a, 0x0f, 0x0f, 
-	0x08, 0x0f, 0x08, 0x0f, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x0f, 0x08, 0x08, 0x08, 0x0e, 0x08, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 0x05, 
+	0x07, 0x07, 0x05, 0x05, 0x04, 0x06, 0x05, 0x05, 
+	0x05, 0x04, 0x07, 0x04, 0x05, 0x05, 0x05, 0x05, 
+	0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x04, 0x07, 
+	0x07, 0x04, 0x05, 0x06, 0x07, 0x04, 0x07, 0x04, 
+	0x07, 0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x07, 0x04, 0x04, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x05, 0x04, 0x07, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 
+	0x07, 0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x04, 0x07, 0x04, 0x07, 
+	0x06, 0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 
+	0x05, 0x04, 0x04, 0x05, 0x04, 0x05, 0x05, 0x05, 
+	0x05, 0x05, 0x05, 0x04, 0x05, 0x04, 0x07, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x04, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x05, 0x04, 0x04, 0x05, 0x04, 
+	0x05, 0x05, 0x05, 0x04, 0x06, 0x05, 0x07, 0x07, 
+	0x04, 0x07, 0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x04, 0x07, 0x04, 0x04, 0x04, 0x07, 0x04, 
 };
 
 static unsigned char m501[256] = {
@@ -2044,38 +1978,38 @@
 };
 
 static unsigned char m502[256] = {
-	0x0c, 0x08, 0x09, 0x08, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0d, 0x08, 0x0d, 0x0e, 0x0f, 0x0c, 0x0e, 
-	0x08, 0x0d, 0x0f, 0x0c, 0x0e, 0x0c, 0x0d, 0x0c, 
-	0x0e, 0x0f, 0x0f, 0x0c, 0x0f, 0x08, 0x0d, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x0d, 0x09, 0x0e, 0x0f, 0x0d, 
-	0x0f, 0x0e, 0x0f, 0x0d, 0x0f, 0x0f, 0x0a, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x0a, 0x09, 0x0e, 0x08, 0x0a, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0f, 
-	0x0f, 0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x0f, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0f, 0x08, 0x0c, 
-	0x08, 0x08, 0x0f, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0d, 0x0f, 0x0e, 
-	0x09, 0x08, 0x0c, 0x0a, 0x08, 0x0c, 0x0a, 0x0a, 
-	0x0f, 0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x0c, 
-	0x0a, 0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x08, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x08, 0x0c, 0x0e, 0x08, 0x0a, 0x08, 0x0a, 
-	0x0a, 0x0a, 0x08, 0x08, 0x0f, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x0d, 0x0c, 0x0d, 0x0c, 0x0d, 
-	0x0c, 0x08, 0x0e, 0x0e, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x08, 0x08, 0x0c, 0x0f, 
-	0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 0x0f, 0x0c, 
-	0x08, 0x08, 0x0f, 0x0c, 0x08, 0x0c, 0x09, 0x08, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x0f, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x08, 0x0e, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0d, 
+	0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x07, 0x07, 0x06, 0x07, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x05, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x07, 0x04, 0x06, 
+	0x04, 0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x04, 0x04, 0x06, 0x05, 0x04, 0x06, 0x05, 0x05, 
+	0x07, 0x04, 0x06, 0x06, 0x04, 0x07, 0x04, 0x06, 
+	0x05, 0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 
+	0x05, 0x05, 0x04, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x07, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x04, 0x07, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m511[256] = {
@@ -2114,38 +2048,38 @@
 };
 
 static unsigned char m512[256] = {
-	0x0d, 0x09, 0x0c, 0x0c, 0x0d, 0x0c, 0x0f, 0x0e, 
-	0x0c, 0x0d, 0x0c, 0x0e, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x0d, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0d, 0x08, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0c, 0x08, 0x0e, 
-	0x0f, 0x0f, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 
-	0x0f, 0x0f, 0x08, 0x0f, 0x0d, 0x0f, 0x09, 0x08, 
-	0x08, 0x0a, 0x0d, 0x08, 0x0e, 0x0e, 0x0a, 0x0c, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x08, 0x0f, 0x08, 0x0d, 
-	0x0f, 0x0d, 0x09, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 
-	0x0a, 0x0f, 0x08, 0x0a, 0x0a, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0a, 0x08, 0x0a, 0x0f, 0x0a, 0x08, 0x08, 
-	0x0f, 0x0a, 0x0a, 0x08, 0x08, 0x0a, 0x09, 0x0c, 
-	0x0a, 0x0e, 0x0d, 0x08, 0x0a, 0x0f, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0a, 0x0f, 
-	0x0c, 0x0a, 0x08, 0x0a, 0x0a, 0x08, 0x0c, 0x08, 
-	0x0f, 0x08, 0x0e, 0x08, 0x0e, 0x0f, 0x08, 0x08, 
-	0x08, 0x08, 0x0d, 0x0a, 0x0f, 0x08, 0x08, 0x0a, 
-	0x0e, 0x0e, 0x0a, 0x0a, 0x08, 0x0a, 0x0f, 0x0f, 
-	0x08, 0x0c, 0x08, 0x0a, 0x0e, 0x0f, 0x0c, 0x08, 
-	0x0a, 0x08, 0x08, 0x08, 0x0f, 0x0c, 0x0f, 0x0a, 
-	0x0c, 0x0b, 0x0c, 0x0f, 0x0f, 0x0d, 0x0c, 0x0a, 
-	0x0c, 0x0a, 0x08, 0x08, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0a, 0x0d, 0x0f, 0x0d, 0x08, 
-	0x0e, 0x0f, 0x08, 0x08, 0x0a, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x0a, 0x08, 0x0a, 0x08, 0x0a, 
-	0x0f, 0x0d, 0x08, 0x0e, 0x08, 0x0e, 0x0f, 0x08, 
-	0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x0f, 0x08, 0x0a, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x06, 0x07, 0x04, 0x04, 
+	0x04, 0x05, 0x06, 0x04, 0x07, 0x07, 0x05, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x04, 0x07, 0x04, 0x06, 
+	0x07, 0x06, 0x04, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x05, 0x07, 0x04, 0x05, 0x05, 0x07, 0x07, 0x07, 
+	0x07, 0x05, 0x04, 0x05, 0x07, 0x05, 0x04, 0x04, 
+	0x07, 0x05, 0x05, 0x04, 0x04, 0x05, 0x04, 0x06, 
+	0x05, 0x07, 0x06, 0x04, 0x05, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x07, 0x05, 0x07, 
+	0x06, 0x05, 0x04, 0x05, 0x05, 0x04, 0x06, 0x04, 
+	0x07, 0x04, 0x07, 0x04, 0x07, 0x07, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x05, 0x07, 0x04, 0x04, 0x05, 
+	0x07, 0x07, 0x05, 0x05, 0x04, 0x05, 0x07, 0x07, 
+	0x04, 0x06, 0x04, 0x05, 0x07, 0x07, 0x06, 0x04, 
+	0x05, 0x04, 0x04, 0x04, 0x07, 0x06, 0x07, 0x05, 
+	0x06, 0x05, 0x06, 0x07, 0x07, 0x06, 0x06, 0x05, 
+	0x06, 0x05, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x05, 0x06, 0x07, 0x06, 0x04, 
+	0x07, 0x07, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 
+	0x07, 0x06, 0x04, 0x07, 0x04, 0x07, 0x07, 0x04, 
+	0x07, 0x07, 0x07, 0x05, 0x05, 0x07, 0x04, 0x05, 
 };
 
 static unsigned char m521[256] = {
@@ -2184,38 +2118,38 @@
 };
 
 static unsigned char m522[256] = {
-	0x0f, 0x0e, 0x0a, 0x0f, 0x08, 0x08, 0x0f, 0x0f, 
-	0x0f, 0x0c, 0x0f, 0x08, 0x0c, 0x0a, 0x0f, 0x08, 
-	0x0c, 0x0f, 0x0e, 0x0c, 0x08, 0x08, 0x0e, 0x0f, 
-	0x0a, 0x0a, 0x0a, 0x0a, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0a, 0x0c, 0x08, 0x08, 0x0f, 0x0d, 0x08, 0x08, 
-	0x0e, 0x0f, 0x0d, 0x0a, 0x08, 0x0a, 0x0f, 0x08, 
-	0x0f, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0f, 0x0f, 
-	0x0f, 0x0b, 0x0f, 0x0f, 0x08, 0x0a, 0x08, 0x0a, 
-	0x0a, 0x0e, 0x0a, 0x0f, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0f, 0x0d, 0x0f, 0x0f, 0x0c, 0x08, 
-	0x0a, 0x0a, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 0x08, 
-	0x08, 0x08, 0x0c, 0x0d, 0x0e, 0x0d, 0x0e, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x08, 0x08, 0x0a, 0x08, 0x0a, 
-	0x08, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0f, 0x08, 0x0c, 0x0d, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x0e, 0x0e, 0x0d, 0x0c, 0x08, 0x08, 0x0d, 
-	0x0f, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 
-	0x0a, 0x0d, 0x09, 0x0e, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x0a, 0x0a, 0x0f, 
-	0x0f, 0x0a, 0x0a, 0x0f, 0x09, 0x08, 0x0c, 0x08, 
-	0x0a, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0c, 0x08, 
-	0x08, 0x0a, 0x0a, 0x0a, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x0a, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x08, 0x09, 0x08, 0x0f, 
-	0x08, 0x0f, 0x08, 0x0a, 0x08, 0x0d, 0x08, 0x08, 
-	0x0a, 0x08, 0x0f, 0x0c, 0x08, 0x0d, 0x0f, 0x0c, 
-	0x0f, 0x0d, 0x08, 0x0d, 0x08, 0x0d, 0x0d, 0x0f, 
-	0x08, 0x08, 0x0d, 0x0d, 0x0f, 0x08, 0x0c, 0x08, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x08, 0x0d, 0x0c, 0x0d, 0x08, 0x0c, 
-	0x0d, 0x0a, 0x0f, 0x0d, 0x0c, 0x08, 0x0f, 0x0f, 
+	0x07, 0x07, 0x05, 0x07, 0x04, 0x04, 0x07, 0x07, 
+	0x07, 0x06, 0x07, 0x04, 0x06, 0x05, 0x07, 0x04, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x04, 0x07, 0x07, 
+	0x05, 0x05, 0x05, 0x05, 0x06, 0x07, 0x06, 0x04, 
+	0x05, 0x06, 0x04, 0x04, 0x07, 0x06, 0x04, 0x04, 
+	0x07, 0x07, 0x06, 0x05, 0x04, 0x05, 0x07, 0x04, 
+	0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 
+	0x07, 0x05, 0x07, 0x07, 0x04, 0x05, 0x04, 0x05, 
+	0x05, 0x07, 0x05, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x04, 
+	0x05, 0x05, 0x06, 0x04, 0x07, 0x06, 0x07, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x04, 0x07, 0x06, 0x04, 0x04, 0x05, 0x04, 0x05, 
+	0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x07, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x05, 0x06, 0x04, 0x07, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x05, 0x05, 0x07, 
+	0x07, 0x05, 0x05, 0x07, 0x04, 0x04, 0x06, 0x04, 
+	0x05, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x04, 
+	0x04, 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 0x07, 0x05, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x04, 0x04, 0x07, 
+	0x04, 0x07, 0x04, 0x05, 0x04, 0x06, 0x04, 0x04, 
+	0x05, 0x04, 0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x07, 0x04, 0x06, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x05, 0x07, 0x06, 0x06, 0x04, 0x07, 0x07, 
 };
 
 static unsigned char m531[256] = {
@@ -2254,38 +2188,38 @@
 };
 
 static unsigned char m532[256] = {
-	0x0a, 0x08, 0x08, 0x08, 0x08, 0x0f, 0x0e, 0x08, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x0c, 0x0c, 0x08, 0x08, 0x0f, 0x0f, 0x0f, 
-	0x08, 0x0f, 0x0e, 0x08, 0x0c, 0x0e, 0x08, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0f, 0x08, 0x08, 0x0a, 0x08, 
-	0x08, 0x08, 0x0f, 0x08, 0x08, 0x0c, 0x0a, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x0f, 0x0a, 0x0a, 0x0c, 0x0c, 0x0e, 0x0f, 
-	0x0d, 0x0f, 0x08, 0x0f, 0x0d, 0x0e, 0x08, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x08, 0x0c, 0x0d, 0x0a, 0x0a, 
-	0x08, 0x0f, 0x0f, 0x0f, 0x0d, 0x0a, 0x0a, 0x0f, 
-	0x08, 0x08, 0x0f, 0x08, 0x0f, 0x08, 0x0f, 0x0a, 
-	0x0f, 0x0e, 0x0a, 0x0e, 0x0a, 0x08, 0x0f, 0x0a, 
-	0x09, 0x0a, 0x08, 0x0a, 0x0c, 0x08, 0x0e, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0e, 0x0b, 0x0f, 0x08, 0x0f, 
-	0x0e, 0x0c, 0x0a, 0x0c, 0x0c, 0x09, 0x08, 0x0f, 
-	0x08, 0x08, 0x0e, 0x08, 0x0f, 0x0a, 0x0a, 0x08, 
-	0x08, 0x0a, 0x0c, 0x0a, 0x0a, 0x0a, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0c, 0x09, 0x0c, 0x0a, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0f, 0x08, 0x0c, 0x0e, 0x0c, 0x0f, 
-	0x09, 0x08, 0x0a, 0x0a, 0x0c, 0x0f, 0x0b, 0x0c, 
-	0x0a, 0x0a, 0x08, 0x08, 0x0c, 0x0d, 0x0a, 0x08, 
-	0x08, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0a, 0x08, 
-	0x08, 0x0c, 0x08, 0x0f, 0x08, 0x08, 0x08, 0x0a, 
-	0x08, 0x0a, 0x0a, 0x0d, 0x08, 0x08, 0x08, 0x08, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0f, 0x08, 0x08, 
-	0x08, 0x0a, 0x08, 0x08, 0x0f, 0x08, 0x0f, 0x0f, 
-	0x0a, 0x0a, 0x08, 0x0f, 0x08, 0x08, 0x08, 0x0e, 
-	0x0a, 0x0d, 0x0d, 0x0f, 0x0f, 0x0f, 0x0e, 0x08, 
-	0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x0e, 0x0a, 0x0a, 
-	0x0f, 0x0a, 0x08, 0x0e, 0x0e, 0x0a, 0x08, 0x08, 
+	0x05, 0x04, 0x04, 0x04, 0x04, 0x07, 0x07, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x04, 0x04, 0x07, 0x07, 0x07, 
+	0x04, 0x07, 0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x04, 0x04, 0x05, 0x04, 
+	0x04, 0x04, 0x07, 0x04, 0x04, 0x06, 0x05, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x07, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x04, 0x06, 0x06, 0x05, 0x05, 
+	0x04, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 0x07, 
+	0x04, 0x04, 0x07, 0x04, 0x07, 0x04, 0x07, 0x05, 
+	0x07, 0x07, 0x05, 0x07, 0x05, 0x04, 0x07, 0x05, 
+	0x04, 0x05, 0x04, 0x05, 0x06, 0x04, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x05, 0x07, 0x04, 0x07, 
+	0x07, 0x06, 0x05, 0x06, 0x06, 0x04, 0x04, 0x07, 
+	0x04, 0x04, 0x07, 0x04, 0x07, 0x05, 0x05, 0x04, 
+	0x04, 0x05, 0x06, 0x05, 0x05, 0x05, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x05, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x04, 0x05, 0x05, 0x06, 0x07, 0x05, 0x06, 
+	0x05, 0x05, 0x04, 0x04, 0x06, 0x06, 0x05, 0x04, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 0x05, 0x04, 
+	0x04, 0x06, 0x04, 0x07, 0x04, 0x04, 0x04, 0x05, 
+	0x04, 0x05, 0x05, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x07, 0x07, 0x07, 0x07, 0x05, 0x07, 0x04, 0x04, 
+	0x04, 0x05, 0x04, 0x04, 0x07, 0x04, 0x07, 0x07, 
+	0x05, 0x05, 0x04, 0x07, 0x04, 0x04, 0x04, 0x07, 
+	0x05, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x04, 0x07, 0x05, 0x05, 
+	0x07, 0x05, 0x04, 0x07, 0x07, 0x05, 0x04, 0x04, 
 };
 
 static unsigned char m541[256] = {
@@ -2324,38 +2258,38 @@
 };
 
 static unsigned char m542[256] = {
-	0x08, 0x0e, 0x08, 0x0f, 0x0f, 0x08, 0x0e, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0e, 0x0a, 0x08, 0x0a, 0x0a, 0x0a, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 0x0e, 0x0f, 
-	0x0f, 0x0a, 0x08, 0x0a, 0x0c, 0x0c, 0x0f, 0x0e, 
-	0x0e, 0x0f, 0x0c, 0x0f, 0x0e, 0x0e, 0x0e, 0x0a, 
-	0x0c, 0x0e, 0x0a, 0x0d, 0x0a, 0x0e, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x08, 0x0f, 0x0f, 0x0c, 0x0f, 0x08, 
-	0x0e, 0x0c, 0x0d, 0x0e, 0x08, 0x0c, 0x0e, 0x0c, 
-	0x0f, 0x08, 0x0f, 0x0a, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0a, 0x09, 0x0a, 0x0a, 0x0e, 0x0a, 0x0a, 0x0a, 
-	0x0a, 0x0a, 0x08, 0x0a, 0x0a, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x0c, 0x0e, 0x0c, 
-	0x0f, 0x08, 0x09, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0f, 0x0e, 0x0f, 0x0c, 0x0f, 0x0e, 0x0e, 
-	0x0e, 0x08, 0x0c, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0e, 0x08, 0x0e, 0x08, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0e, 0x0f, 0x0c, 0x0f, 0x0a, 
-	0x0f, 0x0c, 0x0e, 0x08, 0x0a, 0x0e, 0x0e, 0x08, 
-	0x0c, 0x0a, 0x0e, 0x0a, 0x08, 0x0a, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0a, 0x0b, 0x0c, 0x0e, 0x0e, 
-	0x0f, 0x0e, 0x0e, 0x0f, 0x0f, 0x0e, 0x0c, 0x0e, 
-	0x0c, 0x0e, 0x08, 0x0f, 0x0a, 0x08, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x0c, 0x0e, 0x0c, 0x0f, 0x0c, 0x0e, 
-	0x0f, 0x0f, 0x0e, 0x0c, 0x0f, 0x0c, 0x0e, 0x0e, 
-	0x0f, 0x0f, 0x08, 0x08, 0x0a, 0x0a, 0x0e, 0x0e, 
-	0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0c, 0x0a, 
-	0x08, 0x0a, 0x0a, 0x08, 0x0a, 0x0a, 0x0e, 0x0a, 
-	0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0f, 0x0e, 0x0e, 
-	0x0f, 0x0e, 0x0e, 0x0c, 0x08, 0x0f, 0x0f, 0x08, 
-	0x08, 0x0c, 0x0f, 0x0e, 0x08, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0f, 0x0c, 0x0e, 0x0e, 0x08, 0x0e, 
+	0x04, 0x07, 0x04, 0x07, 0x07, 0x04, 0x07, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x05, 0x04, 0x05, 0x05, 0x05, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x05, 0x04, 0x05, 0x06, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x05, 
+	0x06, 0x07, 0x05, 0x06, 0x05, 0x07, 0x06, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x06, 0x07, 0x04, 
+	0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 
+	0x07, 0x04, 0x07, 0x05, 0x04, 0x04, 0x06, 0x06, 
+	0x05, 0x04, 0x05, 0x05, 0x07, 0x05, 0x05, 0x05, 
+	0x05, 0x05, 0x04, 0x05, 0x05, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 0x06, 
+	0x06, 0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 0x05, 
+	0x07, 0x06, 0x07, 0x04, 0x05, 0x07, 0x07, 0x04, 
+	0x06, 0x05, 0x07, 0x05, 0x04, 0x05, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x05, 0x05, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x06, 0x07, 0x04, 0x07, 0x05, 0x04, 0x06, 0x06, 
+	0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x05, 0x05, 0x07, 0x07, 
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x05, 
+	0x04, 0x05, 0x05, 0x04, 0x05, 0x05, 0x07, 0x05, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x06, 0x04, 0x07, 0x07, 0x04, 
+	0x04, 0x06, 0x07, 0x07, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 0x04, 0x07, 
 };
 
 static unsigned char m551[256] = {
@@ -2394,38 +2328,38 @@
 };
 
 static unsigned char m552[256] = {
-	0x08, 0x0e, 0x08, 0x0c, 0x0d, 0x0c, 0x0f, 0x0f, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0e, 
-	0x0f, 0x0e, 0x0c, 0x08, 0x0e, 0x08, 0x08, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0a, 0x09, 0x08, 0x08, 0x08, 
-	0x0a, 0x08, 0x0a, 0x0a, 0x0a, 0x08, 0x0c, 0x0e, 
-	0x08, 0x08, 0x0e, 0x08, 0x0e, 0x0c, 0x0e, 0x0f, 
-	0x0e, 0x0f, 0x0c, 0x0e, 0x0c, 0x0d, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0e, 0x08, 0x0f, 0x0a, 
-	0x0c, 0x0e, 0x08, 0x0e, 0x0f, 0x0c, 0x0f, 0x08, 
-	0x0c, 0x0a, 0x0e, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x0e, 0x0c, 0x0c, 0x09, 0x08, 0x0e, 0x0f, 0x0c, 
-	0x08, 0x08, 0x08, 0x08, 0x0e, 0x08, 0x0d, 0x0c, 
-	0x08, 0x0e, 0x0c, 0x0d, 0x0e, 0x0e, 0x0e, 0x0a, 
-	0x08, 0x08, 0x0e, 0x08, 0x0a, 0x0a, 0x0a, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x0e, 0x0e, 0x0e, 
-	0x0a, 0x08, 0x08, 0x0e, 0x0f, 0x0c, 0x0e, 0x0c, 
-	0x0f, 0x0e, 0x0e, 0x0e, 0x0f, 0x08, 0x09, 0x0f, 
-	0x0e, 0x0f, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x08, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x08, 
-	0x0f, 0x0f, 0x0d, 0x08, 0x0f, 0x0f, 0x08, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x09, 0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 0x08, 
-	0x08, 0x0e, 0x0c, 0x0e, 0x08, 0x0e, 0x08, 0x0a, 
-	0x08, 0x0a, 0x08, 0x0e, 0x08, 0x0a, 0x0a, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0e, 0x0f, 0x0c, 0x0d, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0e, 0x0e, 0x0f, 0x0c, 0x0e, 0x08, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x0f, 0x0e, 0x08, 0x0f, 
-	0x08, 0x0e, 0x0c, 0x0f, 0x0f, 0x0e, 0x0e, 0x0c, 
-	0x0e, 0x0c, 0x0a, 0x0a, 0x0a, 0x08, 0x08, 0x0e, 
-	0x08, 0x08, 0x0e, 0x0a, 0x08, 0x0a, 0x0c, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x0f, 0x0c, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x04, 0x07, 0x04, 0x04, 0x06, 
+	0x04, 0x04, 0x06, 0x05, 0x04, 0x04, 0x04, 0x04, 
+	0x05, 0x04, 0x05, 0x05, 0x05, 0x04, 0x06, 0x07, 
+	0x04, 0x04, 0x07, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x04, 0x06, 0x07, 0x04, 0x07, 0x05, 
+	0x06, 0x07, 0x04, 0x07, 0x07, 0x06, 0x07, 0x04, 
+	0x06, 0x05, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x04, 0x04, 0x07, 0x07, 0x06, 
+	0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x05, 
+	0x04, 0x04, 0x07, 0x04, 0x05, 0x05, 0x05, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 
+	0x05, 0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 0x04, 
+	0x07, 0x07, 0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 0x05, 
+	0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x05, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x07, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x07, 
+	0x04, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x05, 0x05, 0x05, 0x04, 0x04, 0x07, 
+	0x04, 0x04, 0x07, 0x05, 0x04, 0x05, 0x06, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 0x06, 
 };
 
 static unsigned char m561[256] = {
@@ -2464,38 +2398,38 @@
 };
 
 static unsigned char m562[256] = {
-	0x0e, 0x0e, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x08, 
-	0x0e, 0x0f, 0x08, 0x08, 0x0e, 0x0c, 0x0e, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 
-	0x0a, 0x08, 0x08, 0x0e, 0x0c, 0x0c, 0x0a, 0x0e, 
-	0x08, 0x08, 0x08, 0x0a, 0x0a, 0x08, 0x08, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0e, 0x0a, 0x0c, 0x0d, 
-	0x0c, 0x0a, 0x0f, 0x0c, 0x0f, 0x0c, 0x0f, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x0a, 0x0e, 0x08, 
-	0x08, 0x08, 0x08, 0x0d, 0x0a, 0x08, 0x08, 0x0e, 
-	0x0e, 0x0e, 0x0c, 0x08, 0x0a, 0x08, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0e, 0x0e, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0d, 0x08, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0a, 0x0a, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0f, 0x0c, 
-	0x08, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0e, 0x0e, 
-	0x0c, 0x08, 0x08, 0x0e, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x0a, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0a, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0e, 
-	0x08, 0x08, 0x08, 0x08, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 
-	0x08, 0x0d, 0x08, 0x0c, 0x0e, 0x08, 0x08, 0x0e, 
-	0x08, 0x08, 0x0f, 0x0f, 0x08, 0x0e, 0x0f, 0x0e, 
-	0x0f, 0x0e, 0x0a, 0x08, 0x0e, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0e, 0x08, 0x0a, 0x0c, 0x08, 
-	0x0f, 0x0a, 0x08, 0x08, 0x0a, 0x0a, 0x08, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x08, 0x08, 0x0a, 0x0a, 0x0e, 
+	0x07, 0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x07, 0x04, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x05, 0x04, 0x04, 0x07, 0x06, 0x06, 0x05, 0x07, 
+	0x04, 0x04, 0x04, 0x05, 0x05, 0x04, 0x04, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x07, 0x05, 0x06, 0x06, 
+	0x06, 0x05, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x05, 0x07, 0x04, 
+	0x04, 0x04, 0x04, 0x06, 0x05, 0x04, 0x04, 0x07, 
+	0x07, 0x07, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x05, 0x05, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x04, 0x04, 0x07, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x05, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x04, 0x04, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x07, 0x04, 0x04, 0x07, 
+	0x04, 0x04, 0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x05, 0x04, 0x07, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x06, 0x07, 0x04, 0x05, 0x06, 0x04, 
+	0x07, 0x05, 0x04, 0x04, 0x05, 0x05, 0x04, 0x06, 
+	0x04, 0x07, 0x07, 0x04, 0x04, 0x05, 0x05, 0x07, 
 };
 
 static unsigned char m571[256] = {
@@ -2534,38 +2468,38 @@
 };
 
 static unsigned char m572[256] = {
-	0x08, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 0x0a, 0x0c, 
-	0x0f, 0x0e, 0x0e, 0x0d, 0x0c, 0x0d, 0x08, 0x08, 
-	0x08, 0x08, 0x0d, 0x0d, 0x0c, 0x08, 0x0d, 0x08, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x08, 0x08, 0x08, 0x08, 
-	0x0f, 0x0e, 0x0e, 0x08, 0x0e, 0x0f, 0x0e, 0x0e, 
-	0x0f, 0x08, 0x08, 0x0e, 0x0c, 0x08, 0x08, 0x08, 
-	0x08, 0x0a, 0x0a, 0x0f, 0x08, 0x08, 0x0e, 0x08, 
-	0x0f, 0x0c, 0x0b, 0x08, 0x08, 0x0c, 0x08, 0x0f, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x0e, 0x0f, 0x0f, 0x0e, 
-	0x0f, 0x0f, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x0a, 
-	0x08, 0x08, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 
-	0x0a, 0x0f, 0x0c, 0x08, 0x0f, 0x08, 0x0f, 0x08, 
-	0x0e, 0x0e, 0x0f, 0x0e, 0x08, 0x0e, 0x09, 0x0e, 
-	0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 0x0d, 0x0e, 0x0e, 
-	0x08, 0x08, 0x08, 0x0e, 0x0f, 0x0c, 0x08, 0x08, 
-	0x0c, 0x08, 0x0f, 0x0e, 0x0a, 0x0a, 0x0a, 0x08, 
-	0x09, 0x08, 0x08, 0x0f, 0x0e, 0x08, 0x08, 0x0c, 
-	0x08, 0x08, 0x0a, 0x0f, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0a, 0x0f, 0x0f, 0x0e, 0x0c, 0x0a, 0x0a, 
-	0x08, 0x0a, 0x08, 0x0a, 0x08, 0x0a, 0x0e, 0x08, 
-	0x08, 0x08, 0x0a, 0x08, 0x0a, 0x0c, 0x0c, 0x08, 
-	0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0e, 0x0f, 0x08, 0x08, 0x0c, 0x0d, 
-	0x09, 0x08, 0x08, 0x0f, 0x0c, 0x08, 0x0f, 0x0e, 
-	0x0c, 0x08, 0x0e, 0x08, 0x0e, 0x0e, 0x08, 0x08, 
-	0x0a, 0x0a, 0x0a, 0x08, 0x0c, 0x0a, 0x08, 0x0f, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0e, 0x0c, 0x0a, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0d, 
-	0x0e, 0x0f, 0x0f, 0x0c, 0x0d, 0x0e, 0x08, 0x08, 
+	0x04, 0x06, 0x06, 0x07, 0x07, 0x04, 0x05, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x07, 0x04, 0x04, 0x04, 0x04, 
+	0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x04, 0x04, 0x07, 0x06, 0x04, 0x04, 0x04, 
+	0x04, 0x05, 0x05, 0x07, 0x04, 0x04, 0x07, 0x04, 
+	0x07, 0x06, 0x05, 0x04, 0x04, 0x06, 0x04, 0x07, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 
+	0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 
+	0x05, 0x07, 0x06, 0x04, 0x07, 0x04, 0x07, 0x04, 
+	0x07, 0x07, 0x07, 0x07, 0x04, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 
+	0x04, 0x04, 0x04, 0x07, 0x07, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x07, 0x07, 0x05, 0x05, 0x05, 0x04, 
+	0x04, 0x04, 0x04, 0x07, 0x07, 0x04, 0x04, 0x06, 
+	0x04, 0x04, 0x05, 0x07, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x05, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 
+	0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x07, 0x04, 
+	0x04, 0x04, 0x05, 0x04, 0x05, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x07, 0x07, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x07, 0x06, 0x04, 0x07, 0x07, 
+	0x06, 0x04, 0x07, 0x04, 0x07, 0x07, 0x04, 0x04, 
+	0x05, 0x05, 0x05, 0x04, 0x06, 0x05, 0x04, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x07, 0x06, 0x05, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x04, 
 };
 
 static unsigned char m581[256] = {
@@ -2604,38 +2538,38 @@
 };
 
 static unsigned char m582[256] = {
-	0x0f, 0x0c, 0x0f, 0x08, 0x0c, 0x0d, 0x0f, 0x0e, 
-	0x0d, 0x0d, 0x0d, 0x0e, 0x0c, 0x0e, 0x0c, 0x08, 
-	0x0c, 0x0a, 0x08, 0x08, 0x0c, 0x0a, 0x08, 0x08, 
-	0x08, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x08, 
-	0x0e, 0x0f, 0x08, 0x0c, 0x0f, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0f, 0x0d, 0x0c, 0x0c, 0x0d, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x09, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x08, 0x08, 0x0a, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0e, 0x0e, 0x0c, 0x0d, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 0x0d, 
-	0x0f, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0f, 0x08, 
-	0x08, 0x09, 0x0d, 0x0c, 0x0d, 0x0e, 0x08, 0x08, 
-	0x0c, 0x08, 0x08, 0x0e, 0x0a, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 
-	0x0e, 0x0e, 0x0c, 0x0f, 0x08, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0a, 0x0f, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x0a, 0x0a, 0x08, 0x0d, 0x0c, 0x0f, 0x0f, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0f, 0x08, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x0d, 0x0d, 0x0e, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x08, 0x08, 0x0f, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x0d, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0d, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x0f, 0x08, 0x0a, 0x0d, 
-	0x0a, 0x08, 0x08, 0x0a, 0x0c, 0x08, 0x0a, 0x08, 
-	0x08, 0x0f, 0x0d, 0x09, 0x0c, 0x0d, 0x0c, 0x0c, 
+	0x07, 0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x05, 0x04, 0x04, 0x06, 0x05, 0x04, 0x04, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x07, 0x05, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x04, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x05, 0x07, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x05, 0x05, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x07, 0x07, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x04, 0x04, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x07, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x07, 0x04, 0x05, 0x06, 
+	0x05, 0x04, 0x04, 0x05, 0x06, 0x04, 0x05, 0x04, 
+	0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m591[256] = {
@@ -2674,38 +2608,38 @@
 };
 
 static unsigned char m592[256] = {
-	0x08, 0x08, 0x0a, 0x0c, 0x0a, 0x08, 0x0c, 0x0a, 
-	0x08, 0x08, 0x08, 0x08, 0x0c, 0x0e, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0c, 0x08, 0x0f, 0x0f, 0x0f, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x08, 0x0a, 
-	0x0c, 0x08, 0x0d, 0x08, 0x0e, 0x0e, 0x08, 0x0f, 
-	0x08, 0x0f, 0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 0x0e, 
-	0x08, 0x0f, 0x08, 0x08, 0x0a, 0x08, 0x08, 0x0f, 
-	0x0e, 0x0a, 0x0a, 0x08, 0x0e, 0x08, 0x0d, 0x08, 
-	0x0c, 0x0a, 0x0a, 0x08, 0x0f, 0x0c, 0x08, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0a, 0x08, 0x08, 0x0f, 0x0f, 
-	0x0d, 0x0f, 0x08, 0x0c, 0x0f, 0x0f, 0x0a, 0x0f, 
-	0x0e, 0x08, 0x0f, 0x08, 0x0c, 0x08, 0x08, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x08, 0x08, 0x0a, 0x08, 0x0d, 
-	0x08, 0x0c, 0x0d, 0x0d, 0x09, 0x0d, 0x0d, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 0x0e, 0x0c, 
-	0x0f, 0x0e, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0f, 0x0f, 0x0f, 0x0c, 0x0a, 0x0a, 
-	0x0a, 0x08, 0x0f, 0x08, 0x08, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x0f, 0x08, 0x08, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x08, 0x08, 0x08, 0x0c, 0x0e, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x0f, 0x0c, 0x0c, 
-	0x0f, 0x0a, 0x0a, 0x0a, 0x09, 0x08, 0x0e, 0x0e, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0f, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x09, 0x0e, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0e, 0x0f, 0x0f, 0x08, 0x0c, 0x0a, 
-	0x0e, 0x09, 0x0f, 0x0c, 0x0f, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0e, 0x0d, 0x08, 
-	0x0f, 0x0c, 0x0d, 0x08, 0x0f, 0x0c, 0x0d, 0x08, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x09, 0x0a, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0f, 
+	0x04, 0x04, 0x05, 0x06, 0x05, 0x04, 0x06, 0x05, 
+	0x04, 0x04, 0x04, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x04, 0x07, 0x07, 0x07, 0x06, 
+	0x04, 0x07, 0x07, 0x04, 0x07, 0x04, 0x04, 0x05, 
+	0x06, 0x04, 0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 
+	0x04, 0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x04, 0x07, 0x04, 0x04, 0x05, 0x04, 0x04, 0x07, 
+	0x07, 0x05, 0x05, 0x04, 0x07, 0x04, 0x06, 0x04, 
+	0x06, 0x05, 0x05, 0x04, 0x07, 0x06, 0x04, 0x07, 
+	0x07, 0x07, 0x06, 0x05, 0x04, 0x04, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x05, 0x07, 
+	0x07, 0x04, 0x07, 0x04, 0x06, 0x04, 0x04, 0x04, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x05, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 
+	0x05, 0x04, 0x07, 0x04, 0x04, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x07, 0x04, 0x04, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x04, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x07, 0x05, 0x05, 0x05, 0x04, 0x04, 0x07, 0x07, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 0x06, 0x05, 
+	0x07, 0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x05, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
 };
 
 static unsigned char m5a1[256] = {
@@ -2744,38 +2678,38 @@
 };
 
 static unsigned char m5a2[256] = {
-	0x0c, 0x0f, 0x08, 0x0f, 0x0a, 0x0a, 0x0a, 0x0a, 
-	0x0a, 0x0e, 0x0c, 0x08, 0x0e, 0x08, 0x08, 0x0c, 
-	0x08, 0x0f, 0x08, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x0d, 0x0f, 0x08, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x08, 0x0e, 0x08, 0x0f, 0x08, 0x08, 
-	0x08, 0x0f, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0a, 0x0a, 0x0c, 0x0a, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0f, 0x08, 0x0c, 0x08, 
-	0x0e, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 
-	0x0c, 0x0f, 0x0e, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0d, 0x0e, 
-	0x08, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x08, 0x08, 0x08, 0x0a, 0x0a, 0x0a, 0x0e, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x0e, 
-	0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0c, 0x08, 0x09, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0a, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 0x08, 
-	0x08, 0x08, 0x0a, 0x08, 0x0a, 0x0c, 0x0e, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0f, 0x0c, 0x0e, 0x08, 0x0c, 0x0f, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0a, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
+	0x06, 0x07, 0x04, 0x07, 0x05, 0x05, 0x05, 0x05, 
+	0x05, 0x07, 0x06, 0x04, 0x07, 0x04, 0x04, 0x06, 
+	0x04, 0x07, 0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x07, 0x04, 0x06, 0x07, 
+	0x07, 0x04, 0x04, 0x07, 0x04, 0x07, 0x04, 0x04, 
+	0x04, 0x07, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x04, 0x05, 0x05, 0x06, 0x05, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x07, 0x04, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x06, 0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x07, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x05, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x05, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
 };
 
 static unsigned char m5b1[256] = {
@@ -2814,38 +2748,38 @@
 };
 
 static unsigned char m5b2[256] = {
-	0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0d, 0x0d, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x08, 0x0e, 0x08, 0x08, 0x0a, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x08, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0f, 0x08, 0x0e, 0x0f, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x0a, 0x0f, 0x0e, 0x0f, 0x0f, 0x08, 0x0f, 
-	0x08, 0x08, 0x0e, 0x0f, 0x0f, 0x0e, 0x0a, 0x08, 
-	0x08, 0x0f, 0x0a, 0x0d, 0x0e, 0x08, 0x0c, 0x08, 
-	0x0f, 0x0f, 0x0c, 0x0e, 0x08, 0x0f, 0x08, 0x0c, 
-	0x0d, 0x08, 0x0f, 0x0c, 0x09, 0x0e, 0x08, 0x0c, 
-	0x0a, 0x0e, 0x08, 0x0e, 0x0e, 0x0f, 0x08, 0x0f, 
-	0x0f, 0x0f, 0x08, 0x0f, 0x0f, 0x08, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0f, 0x08, 0x0f, 0x09, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x08, 
-	0x0a, 0x0a, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x0a, 0x0a, 0x0d, 0x0c, 0x0d, 0x08, 
-	0x0f, 0x08, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 
-	0x0f, 0x0f, 0x08, 0x08, 0x08, 0x0a, 0x0a, 0x0f, 
-	0x0d, 0x0c, 0x0f, 0x09, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x0f, 0x0d, 0x08, 0x0c, 0x09, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0a, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x0d, 0x0c, 0x0f, 0x0f, 0x0d, 0x0d, 
-	0x0f, 0x0d, 0x0c, 0x0d, 0x0d, 0x08, 0x0f, 0x0d, 
-	0x0e, 0x0c, 0x0c, 0x08, 0x08, 0x0d, 0x0d, 0x08, 
-	0x0f, 0x0a, 0x0f, 0x0a, 0x0a, 0x08, 0x08, 0x0a, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x07, 0x07, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x04, 0x07, 0x04, 0x04, 0x05, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x04, 0x07, 
+	0x04, 0x04, 0x07, 0x07, 0x07, 0x07, 0x05, 0x04, 
+	0x04, 0x07, 0x05, 0x06, 0x07, 0x04, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x04, 0x07, 0x04, 0x06, 
+	0x05, 0x07, 0x04, 0x07, 0x07, 0x07, 0x04, 0x07, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x04, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x05, 0x04, 
+	0x05, 0x05, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x04, 0x05, 0x05, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x04, 0x04, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x07, 0x04, 0x04, 0x04, 0x05, 0x05, 0x07, 
+	0x06, 0x06, 0x07, 0x04, 0x07, 0x07, 0x07, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x05, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x07, 0x05, 0x07, 0x05, 0x05, 0x04, 0x04, 0x05, 
 };
 
 static unsigned char m5c1[256] = {
@@ -2884,38 +2818,38 @@
 };
 
 static unsigned char m5c2[256] = {
-	0x08, 0x0f, 0x08, 0x0c, 0x0f, 0x08, 0x0a, 0x0d, 
-	0x0d, 0x0f, 0x0f, 0x0d, 0x0c, 0x0d, 0x0d, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0a, 0x0e, 0x0f, 0x08, 
-	0x0a, 0x09, 0x0e, 0x08, 0x0a, 0x0a, 0x08, 0x0c, 
-	0x08, 0x08, 0x0e, 0x08, 0x0f, 0x0e, 0x08, 0x0a, 
-	0x0d, 0x08, 0x0c, 0x08, 0x0e, 0x08, 0x08, 0x08, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x0a, 0x08, 0x08, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0f, 0x0f, 
-	0x0f, 0x0e, 0x0a, 0x08, 0x0c, 0x0f, 0x0d, 0x0c, 
-	0x0f, 0x0a, 0x0a, 0x0f, 0x0c, 0x0d, 0x0f, 0x0e, 
-	0x0e, 0x0f, 0x08, 0x08, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x08, 0x09, 0x0c, 0x0c, 0x0a, 0x08, 
-	0x0f, 0x0a, 0x0d, 0x0e, 0x0d, 0x0f, 0x0a, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0e, 0x0f, 
-	0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x08, 0x0f, 0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0a, 
-	0x08, 0x0a, 0x0a, 0x08, 0x08, 0x08, 0x0c, 0x08, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x08, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x0a, 0x0a, 
-	0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0d, 0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x0f, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0f, 0x08, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x09, 0x08, 0x08, 0x0a, 0x09, 0x0a, 
-	0x09, 0x0a, 0x08, 0x08, 0x0a, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x09, 0x0a, 0x08, 0x08, 0x0a, 0x0a, 0x0a, 0x08, 
-	0x0f, 0x08, 0x0e, 0x08, 0x0c, 0x0e, 0x0c, 0x09, 
-	0x0f, 0x0c, 0x08, 0x08, 0x0d, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x0d, 0x08, 0x0c, 
+	0x04, 0x07, 0x04, 0x06, 0x07, 0x04, 0x05, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x04, 0x05, 0x07, 0x07, 0x04, 
+	0x05, 0x04, 0x07, 0x04, 0x05, 0x05, 0x04, 0x06, 
+	0x04, 0x04, 0x07, 0x04, 0x07, 0x07, 0x04, 0x05, 
+	0x06, 0x04, 0x06, 0x04, 0x07, 0x04, 0x04, 0x04, 
+	0x06, 0x07, 0x04, 0x06, 0x05, 0x04, 0x04, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x07, 0x07, 
+	0x07, 0x07, 0x05, 0x04, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x05, 0x05, 0x07, 0x06, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x07, 0x04, 0x04, 0x06, 0x06, 0x05, 0x04, 
+	0x07, 0x05, 0x06, 0x07, 0x06, 0x07, 0x05, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x04, 0x07, 0x07, 0x06, 0x06, 0x04, 0x06, 0x05, 
+	0x04, 0x05, 0x05, 0x04, 0x04, 0x04, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x05, 0x05, 
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 0x06, 0x07, 
+	0x07, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x05, 
+	0x04, 0x05, 0x04, 0x04, 0x05, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x05, 0x04, 0x04, 0x05, 0x05, 0x05, 0x04, 
+	0x07, 0x04, 0x07, 0x04, 0x06, 0x07, 0x06, 0x04, 
+	0x07, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x06, 0x04, 0x06, 
 };
 
 static unsigned char m5d1[256] = {
@@ -2954,38 +2888,38 @@
 };
 
 static unsigned char m5d2[256] = {
-	0x0c, 0x0c, 0x0a, 0x0a, 0x08, 0x08, 0x0e, 0x0f, 
-	0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x0f, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x08, 0x0f, 0x08, 0x0f, 0x0d, 
-	0x08, 0x0d, 0x0c, 0x0e, 0x08, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x0f, 0x08, 0x08, 0x08, 0x0a, 0x0e, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0e, 0x0a, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0e, 
-	0x08, 0x0c, 0x0e, 0x0f, 0x0f, 0x08, 0x0c, 0x08, 
-	0x0d, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x08, 
-	0x0a, 0x0c, 0x08, 0x0a, 0x08, 0x0a, 0x0c, 0x08, 
-	0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0e, 0x0f, 0x08, 0x08, 0x0f, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0a, 0x08, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x09, 0x08, 0x0c, 0x08, 0x08, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x08, 0x08, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0e, 
-	0x0d, 0x08, 0x0d, 0x08, 0x0d, 0x0d, 0x08, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0a, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0f, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 
-	0x0c, 0x08, 0x08, 0x0a, 0x08, 0x0f, 0x0f, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x08, 0x08, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0a, 0x08, 0x0f, 0x08, 0x08, 0x0f, 0x0a, 
-	0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x0f, 
-	0x08, 0x0c, 0x08, 0x08, 0x08, 0x0f, 0x0f, 0x0c, 
+	0x06, 0x06, 0x05, 0x05, 0x04, 0x04, 0x07, 0x07, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x07, 0x04, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x04, 0x04, 0x05, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x05, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x07, 
+	0x04, 0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 
+	0x05, 0x06, 0x04, 0x05, 0x04, 0x05, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x04, 0x07, 0x07, 0x04, 0x04, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x05, 0x04, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x07, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x05, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x05, 0x04, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x04, 0x04, 0x07, 0x07, 0x07, 
+	0x07, 0x05, 0x04, 0x07, 0x04, 0x04, 0x07, 0x05, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x04, 0x04, 0x07, 
+	0x04, 0x06, 0x04, 0x04, 0x04, 0x07, 0x07, 0x06, 
 };
 
 static unsigned char m5e1[256] = {
@@ -3024,38 +2958,38 @@
 };
 
 static unsigned char m5e2[256] = {
-	0x08, 0x0a, 0x0f, 0x0f, 0x0c, 0x0a, 0x0f, 0x08, 
-	0x0a, 0x08, 0x0c, 0x08, 0x0f, 0x08, 0x0c, 0x0a, 
-	0x0a, 0x0f, 0x08, 0x08, 0x0e, 0x0e, 0x0f, 0x0c, 
-	0x0e, 0x0f, 0x0e, 0x0f, 0x0a, 0x0f, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0a, 0x0a, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x0f, 0x0a, 0x08, 
-	0x08, 0x0a, 0x08, 0x0d, 0x0c, 0x08, 0x0d, 0x0e, 
-	0x0f, 0x08, 0x08, 0x0a, 0x0a, 0x0f, 0x0c, 0x09, 
-	0x0d, 0x0c, 0x0a, 0x0c, 0x0f, 0x0f, 0x08, 0x09, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x08, 0x0c, 0x0e, 0x0f, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x0a, 0x0d, 
-	0x0c, 0x0f, 0x0f, 0x0d, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0f, 0x0f, 0x0f, 0x0c, 0x0e, 0x09, 
-	0x0f, 0x0d, 0x0a, 0x0f, 0x0f, 0x0f, 0x0d, 0x0a, 
-	0x0e, 0x08, 0x0c, 0x08, 0x0f, 0x08, 0x0a, 0x0f, 
-	0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x08, 0x0f, 
-	0x0a, 0x0a, 0x08, 0x0a, 0x0a, 0x0f, 0x0e, 0x0f, 
-	0x08, 0x0a, 0x0f, 0x0c, 0x0f, 0x08, 0x0a, 0x0a, 
-	0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 0x0f, 0x0f, 
-	0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0e, 0x08, 0x08, 0x08, 0x08, 0x0f, 0x08, 
-	0x08, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0f, 0x0f, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x09, 0x0e, 0x0e, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0f, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0d, 0x0c, 0x0d, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0a, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x0a, 0x08, 0x0f, 0x0f, 
-	0x08, 0x08, 0x0f, 0x09, 0x08, 0x08, 0x0e, 0x0e, 
+	0x04, 0x05, 0x07, 0x07, 0x06, 0x05, 0x07, 0x04, 
+	0x05, 0x04, 0x06, 0x04, 0x07, 0x04, 0x06, 0x05, 
+	0x05, 0x07, 0x04, 0x04, 0x07, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x05, 0x07, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x05, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x07, 0x05, 0x04, 
+	0x04, 0x05, 0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 
+	0x07, 0x04, 0x04, 0x05, 0x05, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x05, 0x06, 0x07, 0x07, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x06, 0x07, 0x07, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x05, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x07, 0x07, 0x06, 0x07, 0x04, 
+	0x07, 0x06, 0x05, 0x07, 0x07, 0x07, 0x06, 0x05, 
+	0x07, 0x04, 0x06, 0x04, 0x07, 0x04, 0x05, 0x07, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x07, 
+	0x05, 0x05, 0x04, 0x05, 0x05, 0x07, 0x07, 0x07, 
+	0x04, 0x05, 0x07, 0x06, 0x07, 0x04, 0x05, 0x05, 
+	0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x05, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x05, 0x04, 0x07, 0x07, 
+	0x04, 0x04, 0x07, 0x04, 0x04, 0x04, 0x07, 0x07, 
 };
 
 static unsigned char m5f1[256] = {
@@ -3094,38 +3028,38 @@
 };
 
 static unsigned char m5f2[256] = {
-	0x0a, 0x0f, 0x0e, 0x0a, 0x0f, 0x0c, 0x08, 0x0c, 
-	0x0e, 0x08, 0x0f, 0x0e, 0x08, 0x08, 0x08, 0x0f, 
-	0x08, 0x0b, 0x0c, 0x0f, 0x0d, 0x0f, 0x08, 0x0f, 
-	0x0f, 0x08, 0x0c, 0x0f, 0x08, 0x0c, 0x08, 0x0f, 
-	0x0a, 0x08, 0x0c, 0x0c, 0x0c, 0x0a, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x0a, 0x08, 0x08, 0x0e, 0x0c, 0x0a, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0a, 0x0b, 0x08, 0x0f, 0x08, 0x08, 0x08, 
-	0x0e, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x0d, 0x08, 0x0d, 0x0c, 
-	0x0a, 0x08, 0x0a, 0x0a, 0x0c, 0x0a, 0x0f, 0x0f, 
-	0x0e, 0x0d, 0x08, 0x09, 0x08, 0x0e, 0x08, 0x08, 
-	0x08, 0x0a, 0x0f, 0x08, 0x0e, 0x0c, 0x0b, 0x0d, 
-	0x08, 0x0f, 0x0f, 0x0d, 0x0f, 0x0f, 0x08, 0x0c, 
-	0x0f, 0x0f, 0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x08, 0x0a, 0x0f, 0x0c, 0x0c, 0x0d, 
-	0x0f, 0x0f, 0x0e, 0x08, 0x0a, 0x0f, 0x0c, 0x0f, 
-	0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x08, 
-	0x0f, 0x0d, 0x0f, 0x08, 0x08, 0x0a, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x08, 0x0c, 0x0e, 0x08, 0x0d, 0x0c, 
-	0x0d, 0x0f, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0d, 0x0f, 0x0c, 0x0c, 0x0e, 0x0f, 0x0c, 
-	0x08, 0x08, 0x0c, 0x08, 0x08, 0x0f, 0x0c, 0x0f, 
-	0x08, 0x0d, 0x08, 0x0c, 0x0e, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x0a, 0x0f, 0x0a, 0x08, 
-	0x08, 0x0e, 0x08, 0x08, 0x0f, 0x0f, 0x08, 0x0e, 
-	0x0e, 0x0e, 0x0e, 0x08, 0x0c, 0x0c, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x08, 0x08, 0x08, 0x0e, 0x0c, 0x08, 
-	0x0f, 0x0e, 0x08, 0x0c, 0x0e, 0x0c, 0x08, 0x0a, 
-	0x0c, 0x08, 0x0e, 0x0f, 0x08, 0x0e, 0x0e, 0x0c, 
-	0x08, 0x0e, 0x08, 0x0c, 0x0c, 0x0f, 0x08, 0x0c, 
-	0x0e, 0x08, 0x0c, 0x0e, 0x08, 0x0f, 0x0a, 0x0f, 
+	0x05, 0x07, 0x07, 0x05, 0x07, 0x06, 0x04, 0x06, 
+	0x07, 0x04, 0x07, 0x07, 0x04, 0x04, 0x04, 0x07, 
+	0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x04, 0x07, 
+	0x05, 0x04, 0x06, 0x06, 0x06, 0x05, 0x07, 0x07, 
+	0x06, 0x07, 0x05, 0x04, 0x04, 0x07, 0x06, 0x05, 
+	0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x05, 0x05, 0x04, 0x07, 0x04, 0x04, 0x04, 
+	0x07, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x05, 0x04, 0x05, 0x05, 0x06, 0x05, 0x07, 0x07, 
+	0x07, 0x06, 0x04, 0x04, 0x04, 0x07, 0x04, 0x04, 
+	0x04, 0x05, 0x07, 0x04, 0x07, 0x06, 0x05, 0x06, 
+	0x04, 0x07, 0x07, 0x06, 0x07, 0x07, 0x04, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x04, 0x05, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x04, 0x05, 0x07, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 0x04, 0x04, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x05, 0x06, 0x07, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x04, 0x07, 0x06, 0x07, 
+	0x04, 0x06, 0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x05, 0x07, 0x05, 0x04, 
+	0x04, 0x07, 0x04, 0x04, 0x07, 0x07, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x04, 0x07, 0x06, 0x04, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x06, 0x04, 0x05, 
+	0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 0x07, 0x06, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x07, 0x04, 0x06, 
+	0x07, 0x04, 0x06, 0x07, 0x04, 0x07, 0x05, 0x07, 
 };
 
 static unsigned char m601[256] = {
@@ -3164,38 +3098,38 @@
 };
 
 static unsigned char m602[256] = {
-	0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x08, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 0x0e, 0x0f, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 0x0e, 0x0f, 0x0c, 
-	0x08, 0x0e, 0x0c, 0x0e, 0x0f, 0x0f, 0x0c, 0x08, 
-	0x0f, 0x0f, 0x0c, 0x08, 0x0c, 0x0f, 0x0e, 0x0f, 
-	0x0f, 0x0e, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0a, 0x0a, 0x08, 0x08, 0x0a, 
-	0x0c, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0a, 0x0c, 0x0f, 0x08, 0x08, 
-	0x0f, 0x08, 0x0f, 0x0c, 0x0c, 0x0f, 0x08, 0x08, 
-	0x0c, 0x0f, 0x0e, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0f, 0x0f, 0x0f, 0x0d, 0x0c, 0x0e, 
-	0x0f, 0x0f, 0x0f, 0x0e, 0x0f, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x0c, 0x0a, 0x08, 0x08, 0x0a, 0x08, 
-	0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x08, 0x0e, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x0e, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0f, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0e, 0x08, 0x0f, 0x0c, 0x0f, 0x0c, 
-	0x08, 0x08, 0x0f, 0x0f, 0x0c, 0x0e, 0x08, 0x0f, 
-	0x0f, 0x08, 0x0c, 0x0f, 0x09, 0x08, 0x0a, 0x09, 
-	0x0e, 0x08, 0x08, 0x02, 0x02, 0x02, 0x08, 0x02, 
-	0x0d, 0x0e, 0x0f, 0x09, 0x0f, 0x0c, 0x0d, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x0e, 0x0f, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0f, 0x0e, 0x0d, 
-	0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0e, 0x08, 0x08, 
-	0x0e, 0x0c, 0x0f, 0x0c, 0x0f, 0x0e, 0x08, 0x0f, 
-	0x0f, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 0x0e, 0x0a, 
-	0x0a, 0x0a, 0x08, 0x02, 0x02, 0x02, 0x0a, 0x02, 
-	0x0f, 0x0d, 0x0c, 0x0f, 0x0e, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 
+	0x07, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x04, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x05, 0x05, 0x04, 0x04, 0x05, 
+	0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 
+	0x07, 0x04, 0x07, 0x06, 0x06, 0x07, 0x04, 0x04, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x04, 0x04, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x05, 0x04, 0x04, 0x05, 0x04, 
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x07, 
+	0x06, 0x06, 0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x07, 0x07, 0x06, 0x04, 
+	0x06, 0x04, 0x07, 0x04, 0x07, 0x06, 0x07, 0x06, 
+	0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x04, 0x06, 0x07, 0x04, 0x04, 0x05, 0x04, 
+	0x07, 0x04, 0x04, 0x01, 0x01, 0x01, 0x04, 0x01, 
+	0x06, 0x07, 0x07, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x07, 0x04, 0x04, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 0x04, 0x07, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x04, 0x07, 0x05, 
+	0x05, 0x05, 0x04, 0x01, 0x01, 0x01, 0x05, 0x01, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 
 };
 
 static unsigned char m611[256] = {
@@ -3234,38 +3168,38 @@
 };
 
 static unsigned char m612[256] = {
-	0x0e, 0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x08, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x08, 0x0f, 0x0f, 0x0f, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0f, 0x0d, 0x0c, 0x0c, 0x08, 0x0f, 
-	0x0a, 0x08, 0x08, 0x0e, 0x02, 0x08, 0x02, 0x0f, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x09, 0x08, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0d, 
-	0x08, 0x08, 0x08, 0x0c, 0x09, 0x08, 0x0d, 0x0f, 
-	0x0c, 0x0c, 0x09, 0x08, 0x0d, 0x0c, 0x0c, 0x0d, 
-	0x0f, 0x0c, 0x0f, 0x0d, 0x0f, 0x0c, 0x0e, 0x0c, 
-	0x08, 0x02, 0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0d, 0x09, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0f, 0x0d, 0x09, 0x0c, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x0d, 0x08, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0d, 0x0f, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x09, 0x0d, 0x08, 
-	0x0c, 0x09, 0x0d, 0x0c, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x0c, 0x0d, 0x0e, 0x0c, 0x0c, 0x0f, 0x08, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0f, 0x08, 0x0c, 0x08, 
-	0x09, 0x09, 0x0d, 0x0c, 0x08, 0x0e, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x08, 0x0f, 
-	0x0e, 0x0f, 0x0c, 0x0d, 0x0f, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x0a, 
-	0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x08, 0x0f, 0x0c, 
-	0x08, 0x0c, 0x0e, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x0f, 0x0d, 0x0f, 0x0f, 0x0c, 0x0c, 0x08, 0x08, 
-	0x08, 0x02, 0x02, 0x08, 0x02, 0x08, 0x0c, 0x08, 
-	0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x00, 0x0e, 0x0d, 0x0d, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 0x0f, 
+	0x07, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x07, 0x07, 0x06, 0x06, 0x04, 0x07, 0x07, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 
+	0x05, 0x04, 0x04, 0x07, 0x01, 0x04, 0x01, 0x07, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x04, 0x01, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x07, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x01, 0x01, 0x04, 0x01, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x00, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
 };
 
 static unsigned char m621[256] = {
@@ -3304,38 +3238,38 @@
 };
 
 static unsigned char m622[256] = {
-	0x0d, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x02, 0x0d, 
-	0x0f, 0x0c, 0x0f, 0x02, 0x0f, 0x0f, 0x0f, 0x0a, 
-	0x0f, 0x0f, 0x0f, 0x08, 0x0c, 0x0e, 0x0f, 0x02, 
-	0x0a, 0x0c, 0x0f, 0x0e, 0x08, 0x08, 0x08, 0x0f, 
-	0x0c, 0x0f, 0x0e, 0x0c, 0x0e, 0x0e, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x0a, 0x0c, 0x0f, 0x08, 
-	0x0d, 0x09, 0x0c, 0x0e, 0x0f, 0x08, 0x0d, 0x0a, 
-	0x08, 0x08, 0x0c, 0x08, 0x08, 0x0e, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0e, 0x00, 0x08, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0f, 0x0a, 0x0f, 0x0e, 0x08, 
-	0x0c, 0x0e, 0x0e, 0x0f, 0x0e, 0x00, 0x00, 0x08, 
-	0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 0x0a, 
-	0x08, 0x02, 0x02, 0x02, 0x02, 0x0e, 0x0f, 0x0e, 
-	0x0e, 0x0d, 0x0c, 0x0e, 0x0c, 0x08, 0x0f, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 0x0f, 
-	0x0f, 0x0c, 0x08, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x0e, 0x0c, 0x0f, 0x0e, 0x0f, 
-	0x0f, 0x08, 0x0a, 0x0b, 0x08, 0x08, 0x08, 0x02, 
-	0x02, 0x02, 0x02, 0x08, 0x0a, 0x0a, 0x08, 0x08, 
-	0x0e, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x0f, 0x08, 0x0e, 0x0f, 0x0f, 0x0c, 0x0e, 
-	0x08, 0x08, 0x0f, 0x08, 0x0e, 0x0a, 0x0e, 0x0f, 
-	0x0f, 0x0f, 0x0e, 0x0c, 0x0f, 0x0f, 0x0e, 0x0d, 
-	0x0f, 0x0c, 0x0f, 0x0f, 0x0f, 0x08, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0e, 0x0f, 0x0f, 0x08, 0x08, 0x0a, 
-	0x08, 0x08, 0x02, 0x02, 0x08, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x08, 0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x0e, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x0f, 0x0f, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x01, 0x06, 
+	0x07, 0x06, 0x07, 0x01, 0x07, 0x07, 0x07, 0x05, 
+	0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 0x07, 0x01, 
+	0x05, 0x06, 0x07, 0x07, 0x04, 0x04, 0x04, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x05, 0x06, 0x07, 0x04, 
+	0x06, 0x04, 0x06, 0x07, 0x07, 0x04, 0x06, 0x05, 
+	0x04, 0x04, 0x06, 0x04, 0x04, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x00, 0x04, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x05, 0x07, 0x07, 0x04, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x04, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x05, 
+	0x04, 0x01, 0x01, 0x01, 0x01, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 0x07, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x06, 0x04, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x04, 0x05, 0x05, 0x04, 0x04, 0x04, 0x01, 
+	0x01, 0x01, 0x01, 0x04, 0x05, 0x05, 0x04, 0x04, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x07, 0x04, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x04, 0x04, 0x07, 0x04, 0x07, 0x05, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 0x04, 0x05, 
+	0x04, 0x04, 0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x04, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 
 };
 
 static unsigned char m631[256] = {
@@ -3374,38 +3308,38 @@
 };
 
 static unsigned char m632[256] = {
-	0x0c, 0x0f, 0x0e, 0x0c, 0x08, 0x08, 0x08, 0x0f, 
-	0x0e, 0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 
-	0x00, 0x08, 0x02, 0x0a, 0x00, 0x02, 0x02, 0x0a, 
-	0x02, 0x0a, 0x02, 0x0a, 0x02, 0x02, 0x00, 0x00, 
-	0x0e, 0x0c, 0x0e, 0x0f, 0x0c, 0x0c, 0x08, 0x0f, 
-	0x08, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x0f, 0x0d, 0x0c, 0x0f, 0x0d, 0x08, 
-	0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x0e, 0x0e, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0e, 0x0f, 0x0e, 0x0e, 0x0f, 
-	0x0f, 0x0c, 0x08, 0x08, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x02, 0x02, 
-	0x08, 0x02, 0x02, 0x02, 0x08, 0x0c, 0x08, 0x0f, 
-	0x0d, 0x0e, 0x08, 0x0c, 0x08, 0x0e, 0x0f, 0x0c, 
-	0x0c, 0x0e, 0x0d, 0x08, 0x08, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x08, 0x0f, 0x0f, 0x0c, 0x0c, 0x08, 0x09, 
-	0x0e, 0x0c, 0x0e, 0x0d, 0x0c, 0x0c, 0x08, 0x0e, 
-	0x0f, 0x0f, 0x0e, 0x08, 0x0f, 0x0c, 0x0e, 0x0e, 
-	0x0e, 0x0c, 0x0f, 0x08, 0x0c, 0x08, 0x0f, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0d, 0x0f, 0x0e, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0c, 0x0e, 0x0e, 0x0e, 0x0c, 
-	0x0e, 0x0c, 0x08, 0x02, 0x02, 0x00, 0x08, 0x02, 
-	0x02, 0x00, 0x0a, 0x00, 0x02, 0x0c, 0x0e, 0x08, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x0f, 
-	0x0f, 0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0a, 0x0c, 
-	0x0e, 0x0f, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0e, 0x0e, 0x0c, 0x08, 0x0f, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0f, 0x0c, 0x0f, 0x09, 
-	0x0a, 0x0c, 0x08, 0x00, 0x00, 0x02, 0x08, 0x02, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x04, 0x04, 0x07, 
+	0x07, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x00, 0x04, 0x01, 0x05, 0x00, 0x01, 0x01, 0x05, 
+	0x01, 0x05, 0x01, 0x05, 0x01, 0x01, 0x00, 0x00, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x07, 
+	0x04, 0x04, 0x07, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x04, 0x04, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x01, 0x01, 
+	0x04, 0x01, 0x01, 0x01, 0x04, 0x06, 0x04, 0x07, 
+	0x06, 0x07, 0x04, 0x06, 0x04, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x04, 0x06, 0x07, 0x07, 
+	0x06, 0x04, 0x07, 0x07, 0x06, 0x06, 0x04, 0x04, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x06, 0x07, 0x04, 0x06, 0x04, 0x07, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x04, 0x01, 0x01, 0x00, 0x04, 0x01, 
+	0x01, 0x00, 0x05, 0x00, 0x01, 0x06, 0x07, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 
+	0x05, 0x06, 0x04, 0x00, 0x00, 0x01, 0x04, 0x01, 
 };
 
 static unsigned char m641[256] = {
@@ -3444,38 +3378,38 @@
 };
 
 static unsigned char m642[256] = {
-	0x02, 0x02, 0x02, 0x08, 0x00, 0x02, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0c, 0x0e, 0x0e, 0x0d, 0x0c, 0x0f, 
-	0x0e, 0x08, 0x0c, 0x0e, 0x0f, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x0f, 0x08, 0x0e, 0x0c, 
-	0x0e, 0x0e, 0x0d, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0b, 0x08, 0x08, 0x0e, 0x0d, 0x0e, 
-	0x0c, 0x0e, 0x00, 0x0c, 0x02, 0x02, 0x0a, 0x0a, 
-	0x02, 0x08, 0x02, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x08, 0x08, 0x08, 
-	0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0d, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x0e, 0x0c, 0x0d, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x0e, 0x08, 0x02, 0x0e, 0x08, 0x0e, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0b, 0x0f, 0x0d, 0x08, 0x0e, 0x0e, 0x0c, 
-	0x0c, 0x0e, 0x0d, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0f, 0x0d, 0x0c, 0x08, 
-	0x08, 0x0e, 0x08, 0x0d, 0x0e, 0x0f, 0x0f, 0x08, 
-	0x0f, 0x0c, 0x0d, 0x0c, 0x08, 0x02, 0x08, 0x02, 
-	0x02, 0x08, 0x02, 0x0d, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0a, 0x0d, 0x0e, 0x0c, 0x0d, 0x0f, 0x08, 0x0d, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x0f, 0x0f, 0x0c, 
-	0x0e, 0x08, 0x0f, 0x08, 0x0d, 0x08, 0x0c, 0x0e, 
-	0x0f, 0x0c, 0x0d, 0x0c, 0x08, 0x00, 0x02, 0x08, 
-	0x0c, 0x09, 0x0f, 0x0c, 0x0e, 0x09, 0x0f, 0x09, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 
+	0x01, 0x01, 0x01, 0x04, 0x00, 0x01, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x07, 0x07, 0x04, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x05, 0x04, 0x04, 0x07, 0x06, 0x07, 
+	0x06, 0x07, 0x00, 0x06, 0x01, 0x01, 0x05, 0x05, 
+	0x01, 0x04, 0x01, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 0x04, 0x04, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x07, 0x04, 0x01, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x05, 0x07, 0x06, 0x04, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x04, 0x07, 0x04, 0x06, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x01, 0x04, 0x01, 
+	0x01, 0x04, 0x01, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x05, 0x06, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x07, 0x07, 0x06, 
+	0x07, 0x04, 0x07, 0x04, 0x06, 0x04, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x00, 0x01, 0x04, 
+	0x06, 0x04, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m651[256] = {
@@ -3514,38 +3448,38 @@
 };
 
 static unsigned char m652[256] = {
-	0x0f, 0x0c, 0x08, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0e, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x02, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0e, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0d, 0x0f, 0x0d, 0x0c, 0x0e, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0a, 0x0a, 0x0f, 0x0d, 
-	0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x0c, 0x0f, 0x0f, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0f, 0x0c, 0x08, 
-	0x0f, 0x0e, 0x0c, 0x08, 0x0a, 0x09, 0x09, 0x0f, 
-	0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0e, 0x0f, 0x0d, 
-	0x0c, 0x0e, 0x08, 0x02, 0x0c, 0x0e, 0x0f, 0x08, 
-	0x08, 0x08, 0x0f, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x00, 0x0c, 0x0a, 0x0f, 0x09, 0x08, 0x0c, 
-	0x0a, 0x08, 0x0f, 0x0c, 0x0f, 0x0d, 0x0c, 0x0f, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x01, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x09, 0x00, 0x0f, 
-	0x08, 0x08, 0x08, 0x0a, 0x0f, 0x08, 0x08, 0x00, 
-	0x0f, 0x0f, 0x0c, 0x02, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x0f, 0x08, 0x0f, 0x0f, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0f, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x02, 0x0c, 0x0f, 0x0d, 0x0a, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x0f, 0x0f, 0x08, 0x0c, 
-	0x00, 0x0f, 0x0c, 0x0e, 0x0e, 0x0f, 0x0e, 0x08, 
-	0x08, 0x08, 0x08, 0x0f, 0x0f, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x08, 0x0f, 0x0c, 0x08, 0x00, 0x0e, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0b, 0x0c, 0x0e, 0x09, 0x08, 0x0f, 0x0f, 0x0a, 
-	0x0f, 0x0f, 0x08, 0x08, 0x0f, 0x0f, 0x0e, 0x0e, 
-	0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0c, 0x0a, 0x02, 
-	0x00, 0x08, 0x0f, 0x0d, 0x0d, 0x0d, 0x08, 0x09, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x01, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x05, 0x05, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x04, 0x06, 0x07, 0x07, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x07, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x04, 0x05, 0x04, 0x04, 0x07, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x04, 0x01, 0x06, 0x07, 0x07, 0x04, 
+	0x04, 0x04, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x00, 0x06, 0x05, 0x07, 0x04, 0x04, 0x06, 
+	0x05, 0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x00, 0x07, 
+	0x04, 0x04, 0x04, 0x05, 0x07, 0x04, 0x04, 0x00, 
+	0x07, 0x07, 0x06, 0x01, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x04, 0x07, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 
+	0x06, 0x01, 0x06, 0x07, 0x06, 0x05, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x04, 0x06, 
+	0x00, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x04, 0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x04, 0x07, 0x06, 0x04, 0x00, 0x07, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x05, 0x06, 0x07, 0x04, 0x04, 0x07, 0x07, 0x05, 
+	0x07, 0x07, 0x04, 0x04, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x05, 0x01, 
+	0x00, 0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 
 };
 
 static unsigned char m661[256] = {
@@ -3584,38 +3518,38 @@
 };
 
 static unsigned char m662[256] = {
-	0x0e, 0x08, 0x0e, 0x0e, 0x0c, 0x0c, 0x0f, 0x0d, 
-	0x0c, 0x0d, 0x0f, 0x0c, 0x0f, 0x0c, 0x0f, 0x0f, 
-	0x0d, 0x0d, 0x0c, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 
-	0x08, 0x0a, 0x08, 0x08, 0x0c, 0x0e, 0x09, 0x0f, 
-	0x0f, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x08, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 
-	0x09, 0x0f, 0x0c, 0x0c, 0x0f, 0x0e, 0x0f, 0x08, 
-	0x08, 0x0c, 0x0d, 0x09, 0x0a, 0x00, 0x02, 0x00, 
-	0x08, 0x0f, 0x0d, 0x0f, 0x09, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x0b, 0x0e, 0x08, 0x08, 0x0f, 
-	0x08, 0x0c, 0x0e, 0x02, 0x02, 0x02, 0x02, 0x0a, 
-	0x08, 0x0d, 0x0e, 0x0d, 0x0c, 0x0d, 0x0d, 0x0f, 
-	0x08, 0x0e, 0x0c, 0x08, 0x0f, 0x0d, 0x0f, 0x09, 
-	0x0f, 0x09, 0x0c, 0x09, 0x0c, 0x08, 0x0f, 0x0f, 
-	0x0e, 0x0c, 0x0c, 0x09, 0x0f, 0x08, 0x0f, 0x0f, 
-	0x0d, 0x0c, 0x0f, 0x0c, 0x0c, 0x08, 0x0e, 0x08, 
-	0x0c, 0x08, 0x02, 0x00, 0x0f, 0x08, 0x0c, 0x0f, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 0x09, 0x08, 
-	0x0d, 0x0f, 0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x0f, 
-	0x0d, 0x0c, 0x08, 0x08, 0x08, 0x0f, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x08, 0x08, 0x08, 0x08, 0x02, 
-	0x0e, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x09, 0x0f, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0d, 0x08, 0x0c, 0x0f, 0x08, 
-	0x0c, 0x08, 0x08, 0x08, 0x0d, 0x08, 0x0d, 0x0d, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x08, 0x0c, 0x08, 0x08, 0x08, 0x0d, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x0e, 0x0f, 0x0f, 0x0c, 0x08, 
-	0x0d, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x08, 
-	0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x08, 0x0f, 0x0f, 0x0f, 0x08, 0x0c, 0x0f, 
-	0x0d, 0x0f, 0x09, 0x00, 0x0f, 0x00, 0x0f, 0x0f, 
+	0x07, 0x04, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 0x04, 
+	0x04, 0x05, 0x04, 0x04, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x07, 0x04, 0x04, 0x06, 0x04, 0x07, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x05, 0x00, 0x01, 0x00, 
+	0x04, 0x07, 0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x05, 0x07, 0x04, 0x04, 0x07, 
+	0x04, 0x06, 0x07, 0x01, 0x01, 0x01, 0x01, 0x05, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x04, 0x07, 0x06, 0x07, 0x04, 
+	0x07, 0x04, 0x06, 0x04, 0x06, 0x04, 0x07, 0x07, 
+	0x07, 0x06, 0x06, 0x04, 0x07, 0x04, 0x07, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 0x07, 0x04, 
+	0x06, 0x04, 0x01, 0x00, 0x07, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x04, 
+	0x06, 0x07, 0x04, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x07, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x01, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x07, 0x04, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x04, 0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x04, 0x00, 0x07, 0x00, 0x07, 0x07, 
 };
 
 static unsigned char m671[256] = {
@@ -3654,38 +3588,38 @@
 };
 
 static unsigned char m672[256] = {
-	0x0f, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0f, 0x0f, 0x0e, 0x0f, 0x08, 0x0f, 0x08, 0x0c, 
-	0x0e, 0x08, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x08, 0x08, 0x0f, 0x08, 0x0f, 0x09, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0f, 0x0d, 
-	0x0f, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0a, 
-	0x00, 0x0f, 0x08, 0x0c, 0x0f, 0x0e, 0x09, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0a, 0x00, 0x0a, 0x02, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0e, 0x0f, 0x08, 0x0c, 0x0e, 0x0c, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 0x0f, 
-	0x0e, 0x0a, 0x08, 0x00, 0x00, 0x0a, 0x08, 0x00, 
-	0x02, 0x02, 0x0e, 0x08, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0f, 0x0d, 0x0e, 0x0f, 0x0c, 0x0f, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0e, 0x0c, 0x0f, 0x0f, 
-	0x08, 0x0e, 0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x0f, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x09, 
-	0x0f, 0x0c, 0x0c, 0x0d, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0e, 0x0c, 0x0f, 0x08, 0x0f, 0x0f, 0x0a, 0x0c, 
-	0x00, 0x08, 0x0a, 0x0a, 0x08, 0x02, 0x08, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x08, 0x02, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x0c, 0x0f, 0x0c, 0x0e, 0x0f, 0x0f, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x09, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x0e, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x08, 
-	0x0e, 0x0e, 0x0f, 0x0c, 0x0e, 0x0f, 0x0e, 0x0c, 
-	0x0a, 0x08, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x09, 0x0c, 0x02, 0x09, 0x0e, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x07, 0x07, 0x07, 0x07, 0x04, 0x07, 0x04, 0x06, 
+	0x07, 0x04, 0x06, 0x06, 0x07, 0x07, 0x04, 0x07, 
+	0x06, 0x04, 0x04, 0x07, 0x04, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x07, 0x06, 
+	0x07, 0x00, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 
+	0x00, 0x07, 0x04, 0x06, 0x07, 0x07, 0x04, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x05, 0x00, 0x05, 0x01, 0x04, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x07, 0x04, 0x06, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x05, 0x04, 0x00, 0x00, 0x05, 0x04, 0x00, 
+	0x01, 0x01, 0x07, 0x04, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x04, 0x07, 0x04, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x06, 0x07, 0x04, 0x07, 0x07, 0x05, 0x06, 
+	0x00, 0x04, 0x05, 0x05, 0x04, 0x01, 0x04, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x04, 0x01, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 0x04, 0x04, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x05, 0x04, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x01, 0x04, 0x07, 
 };
 
 static unsigned char m681[256] = {
@@ -3724,38 +3658,38 @@
 };
 
 static unsigned char m682[256] = {
-	0x0a, 0x08, 0x00, 0x00, 0x08, 0x0a, 0x08, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x08, 0x0a, 0x0d, 0x0f, 0x0c, 0x08, 0x0f, 0x0f, 
-	0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0e, 0x08, 0x0c, 
-	0x0c, 0x0f, 0x09, 0x08, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0e, 0x0e, 0x0c, 0x0c, 0x08, 0x0a, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 0x0a, 0x08, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 0x08, 
-	0x0f, 0x0e, 0x0a, 0x0c, 0x0e, 0x0c, 0x0f, 0x0c, 
-	0x0f, 0x0f, 0x08, 0x0f, 0x0f, 0x0a, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x0e, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0f, 0x0e, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0f, 0x0c, 0x0e, 0x08, 0x0f, 0x0e, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x08, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0d, 0x08, 0x0c, 0x0f, 
-	0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x0d, 
-	0x0c, 0x0d, 0x0f, 0x0c, 0x0c, 0x08, 0x0a, 0x0f, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x0d, 0x0c, 0x0f, 0x0c, 0x0f, 0x09, 0x08, 
-	0x08, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 
-	0x02, 0x08, 0x02, 0x08, 0x0d, 0x09, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0f, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x0d, 
-	0x0f, 0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0f, 0x0c, 0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 
-	0x0e, 0x0e, 0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x0c, 0x0e, 0x0c, 0x08, 0x08, 
+	0x05, 0x04, 0x00, 0x00, 0x04, 0x05, 0x04, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x04, 0x05, 0x06, 0x07, 0x06, 0x04, 0x07, 0x07, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x07, 0x04, 0x06, 
+	0x06, 0x07, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x05, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x07, 0x05, 0x04, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x07, 0x05, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x05, 0x04, 0x04, 
+	0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x00, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x07, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 0x05, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 0x04, 
+	0x04, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 
+	0x01, 0x04, 0x01, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x07, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x04, 0x04, 
 };
 
 static unsigned char m691[256] = {
@@ -3794,38 +3728,38 @@
 };
 
 static unsigned char m692[256] = {
-	0x09, 0x0a, 0x08, 0x08, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x0c, 0x0f, 0x0f, 0x0c, 
-	0x0e, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x08, 0x02, 
-	0x02, 0x00, 0x00, 0x00, 0x02, 0x0c, 0x00, 0x09, 
-	0x00, 0x08, 0x0c, 0x08, 0x08, 0x02, 0x08, 0x0c, 
-	0x0f, 0x08, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x0f, 0x09, 0x0c, 0x0f, 
-	0x0c, 0x0d, 0x0f, 0x0c, 0x0c, 0x0e, 0x0f, 0x0c, 
-	0x0f, 0x09, 0x0d, 0x0f, 0x08, 0x0c, 0x0e, 0x08, 
-	0x0d, 0x0c, 0x0c, 0x0f, 0x0c, 0x0d, 0x0f, 0x0d, 
-	0x0c, 0x0e, 0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0a, 0x08, 0x00, 0x08, 
-	0x0a, 0x00, 0x0e, 0x0c, 0x02, 0x08, 0x0e, 0x02, 
-	0x02, 0x02, 0x08, 0x00, 0x08, 0x0e, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0e, 0x0f, 0x0c, 0x0c, 
-	0x0a, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0f, 
-	0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x0d, 0x0c, 
-	0x0c, 0x0e, 0x08, 0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 
-	0x08, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0e, 0x0d, 0x0f, 0x0d, 0x0e, 0x0c, 
-	0x0f, 0x08, 0x08, 0x0c, 0x0e, 0x08, 0x08, 0x08, 
-	0x08, 0x0c, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 
-	0x02, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x09, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0d, 0x0c, 0x0f, 0x0c, 0x0f, 
+	0x04, 0x05, 0x04, 0x04, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x00, 0x00, 0x04, 0x04, 0x00, 0x04, 0x01, 
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x00, 0x04, 
+	0x00, 0x04, 0x06, 0x04, 0x04, 0x01, 0x04, 0x06, 
+	0x07, 0x04, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x05, 0x04, 0x00, 0x04, 
+	0x05, 0x00, 0x07, 0x06, 0x01, 0x04, 0x07, 0x01, 
+	0x01, 0x01, 0x04, 0x00, 0x04, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x05, 0x06, 0x06, 0x07, 0x07, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x04, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x04, 0x04, 0x06, 0x07, 0x04, 0x04, 0x04, 
+	0x04, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 
+	0x01, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 0x07, 
 };
 
 static unsigned char m6a1[256] = {
@@ -3864,38 +3798,38 @@
 };
 
 static unsigned char m6a2[256] = {
-	0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x08, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0d, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0e, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 0x0d, 0x0f, 
-	0x0c, 0x0f, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x08, 0x0a, 0x08, 0x08, 0x08, 0x00, 0x02, 
-	0x00, 0x02, 0x0c, 0x08, 0x0c, 0x0f, 0x08, 0x08, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0f, 0x08, 0x0c, 0x0e, 
-	0x0d, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x09, 0x09, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0f, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0a, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0a, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x08, 
-	0x08, 0x02, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0d, 0x08, 0x08, 0x0c, 0x0d, 0x0f, 0x08, 
-	0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x02, 0x08, 0x0a, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x08, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x08, 0x08, 
-	0x08, 0x08, 0x0d, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x00, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x00, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x09, 0x00, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x08, 0x08, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x04, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x04, 0x05, 0x04, 0x04, 0x04, 0x00, 0x01, 
+	0x00, 0x01, 0x06, 0x04, 0x06, 0x07, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x07, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x05, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x05, 0x04, 0x00, 0x00, 0x00, 0x06, 0x04, 
+	0x04, 0x01, 0x04, 0x00, 0x01, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x04, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x01, 0x04, 0x05, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x00, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x00, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x00, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 
 };
 
 static unsigned char m6b1[256] = {
@@ -3934,38 +3868,38 @@
 };
 
 static unsigned char m6b2[256] = {
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x00, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x09, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x00, 
-	0x0f, 0x0f, 0x0a, 0x0f, 0x0a, 0x0c, 0x08, 0x0a, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x0c, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0f, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0f, 0x0f, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0f, 0x0c, 0x0d, 0x08, 
-	0x0d, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0e, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0d, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 
-	0x08, 0x08, 0x0f, 0x08, 0x08, 0x0c, 0x08, 0x08, 
-	0x08, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x0c, 0x0d, 
-	0x0d, 0x0e, 0x08, 0x0f, 0x02, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0a, 0x0e, 0x0f, 0x0f, 0x08, 0x0f, 0x02, 
-	0x0c, 0x0f, 0x0f, 0x0a, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x02, 0x02, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0d, 0x0c, 0x02, 0x0e, 0x08, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0a, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x00, 0x0d, 0x0e, 0x0a, 0x0f, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0d, 0x08, 0x0d, 0x0c, 0x08, 0x0f, 
-	0x0c, 0x0b, 0x02, 0x0c, 0x0c, 0x0f, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x08, 0x0f, 0x0f, 0x0f, 0x02, 0x0f, 0x0f, 
-	0x0d, 0x02, 0x0c, 0x0f, 0x08, 0x08, 0x0c, 0x00, 
-	0x0c, 0x0a, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0a, 0x0f, 0x0d, 0x08, 0x00, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x08, 0x0a, 0x08, 0x0c, 
-	0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x00, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x00, 
+	0x07, 0x07, 0x05, 0x07, 0x05, 0x06, 0x04, 0x05, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x04, 0x04, 0x07, 0x04, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x07, 0x01, 0x04, 0x06, 0x06, 
+	0x06, 0x05, 0x07, 0x07, 0x07, 0x04, 0x07, 0x01, 
+	0x06, 0x07, 0x07, 0x05, 0x06, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x01, 0x01, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x01, 0x07, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x00, 0x06, 0x07, 0x05, 0x07, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x07, 
+	0x06, 0x05, 0x01, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x04, 0x07, 0x07, 0x07, 0x01, 0x07, 0x07, 
+	0x06, 0x01, 0x06, 0x07, 0x04, 0x04, 0x06, 0x00, 
+	0x06, 0x05, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x05, 0x07, 0x06, 0x04, 0x00, 0x07, 
+	0x06, 0x04, 0x06, 0x07, 0x04, 0x05, 0x04, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 
 };
 
 static unsigned char m6c1[256] = {
@@ -4004,38 +3938,38 @@
 };
 
 static unsigned char m6c2[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x02, 
-	0x0d, 0x0c, 0x08, 0x0c, 0x0c, 0x0e, 0x00, 0x0f, 
-	0x0e, 0x0f, 0x08, 0x0f, 0x0e, 0x0e, 0x0e, 0x00, 
-	0x0e, 0x0e, 0x0e, 0x0e, 0x08, 0x0c, 0x08, 0x0e, 
-	0x0c, 0x0e, 0x02, 0x0d, 0x0e, 0x0c, 0x0e, 0x0e, 
-	0x0e, 0x02, 0x0e, 0x0c, 0x0c, 0x08, 0x0e, 0x0e, 
-	0x0e, 0x08, 0x0a, 0x0c, 0x0f, 0x02, 0x0c, 0x09, 
-	0x0f, 0x08, 0x00, 0x0c, 0x08, 0x02, 0x0d, 0x0c, 
-	0x0f, 0x0f, 0x0f, 0x0c, 0x08, 0x08, 0x0e, 0x02, 
-	0x00, 0x0a, 0x0e, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0f, 0x08, 0x0c, 0x08, 0x0e, 0x0f, 0x08, 0x0f, 
-	0x08, 0x0c, 0x09, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0e, 0x08, 0x08, 0x02, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0e, 0x0f, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 
-	0x0f, 0x0c, 0x0f, 0x0c, 0x0e, 0x08, 0x0f, 0x08, 
-	0x0c, 0x0a, 0x0d, 0x0c, 0x08, 0x0f, 0x0f, 0x08, 
-	0x0c, 0x0f, 0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 0x0d, 
-	0x0f, 0x0e, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 
-	0x0f, 0x08, 0x0d, 0x0f, 0x0f, 0x0d, 0x0d, 0x08, 
-	0x0c, 0x0f, 0x0d, 0x0f, 0x0c, 0x0c, 0x08, 0x0a, 
-	0x08, 0x0a, 0x08, 0x0a, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x0a, 0x0f, 0x0c, 0x0e, 0x0f, 0x08, 
-	0x0c, 0x0e, 0x0a, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x08, 0x0f, 0x0c, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0f, 0x0e, 0x0f, 0x0e, 0x0f, 
-	0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 0x08, 
-	0x0e, 0x0f, 0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x0c, 
-	0x0f, 0x0c, 0x0a, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 
-	0x0f, 0x0e, 0x0c, 0x0f, 0x08, 0x0e, 0x02, 0x02, 
-	0x02, 0x0c, 0x02, 0x02, 0x02, 0x02, 0x02, 0x08, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x01, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 0x00, 0x07, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 0x07, 0x00, 
+	0x07, 0x07, 0x07, 0x07, 0x04, 0x06, 0x04, 0x07, 
+	0x06, 0x07, 0x01, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x01, 0x07, 0x06, 0x06, 0x04, 0x07, 0x07, 
+	0x07, 0x04, 0x05, 0x06, 0x07, 0x01, 0x06, 0x04, 
+	0x07, 0x04, 0x00, 0x06, 0x04, 0x01, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x04, 0x04, 0x07, 0x01, 
+	0x00, 0x05, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x04, 0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 
+	0x04, 0x06, 0x04, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x01, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 
+	0x06, 0x05, 0x06, 0x06, 0x04, 0x07, 0x07, 0x04, 
+	0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x04, 0x05, 
+	0x04, 0x05, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x05, 0x07, 0x06, 0x07, 0x07, 0x04, 
+	0x06, 0x07, 0x05, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x04, 
+	0x07, 0x07, 0x07, 0x07, 0x04, 0x07, 0x04, 0x06, 
+	0x07, 0x06, 0x05, 0x07, 0x06, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x04, 0x07, 0x01, 0x01, 
+	0x01, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 
 };
 
 static unsigned char m6d1[256] = {
@@ -4074,38 +4008,38 @@
 };
 
 static unsigned char m6d2[256] = {
-	0x0c, 0x0e, 0x08, 0x0c, 0x0e, 0x08, 0x08, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0d, 0x0e, 0x08, 0x08, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x0e, 0x0f, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x08, 0x08, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x0d, 0x0f, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0e, 0x0f, 0x0e, 0x0c, 0x0f, 0x0d, 0x0c, 
-	0x0d, 0x0f, 0x0c, 0x0f, 0x0e, 0x0f, 0x0f, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0a, 0x08, 0x0a, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x08, 0x08, 
-	0x0c, 0x0f, 0x0f, 0x08, 0x0b, 0x08, 0x0e, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x08, 0x0d, 0x0c, 0x0f, 0x0e, 
-	0x0c, 0x08, 0x08, 0x08, 0x0f, 0x0c, 0x0c, 0x0f, 
-	0x0f, 0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x0f, 0x0c, 0x0d, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0f, 0x0d, 0x0f, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x0e, 0x0f, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0a, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x08, 0x02, 0x02, 
-	0x02, 0x02, 0x0e, 0x0e, 0x0c, 0x08, 0x0e, 0x0f, 
-	0x08, 0x08, 0x0f, 0x0c, 0x0c, 0x0f, 0x08, 0x0c, 
-	0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0f, 0x08, 0x0c, 0x09, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0f, 0x0f, 0x0d, 0x0c, 0x0c, 0x0e, 0x0f, 0x0c, 
-	0x0e, 0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x08, 
-	0x0d, 0x0c, 0x0d, 0x0f, 0x0e, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 0x0d, 0x0c, 0x0f, 
-	0x09, 0x0f, 0x0d, 0x0f, 0x0e, 0x0c, 0x08, 0x08, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x04, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x04, 0x04, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x04, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x05, 0x04, 0x05, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x04, 0x04, 
+	0x06, 0x07, 0x07, 0x04, 0x05, 0x04, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x04, 0x04, 0x04, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x05, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x04, 0x01, 0x01, 
+	0x01, 0x01, 0x07, 0x07, 0x06, 0x04, 0x07, 0x07, 
+	0x04, 0x04, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 
+	0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x04, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 0x04, 0x04, 
 };
 
 static unsigned char m6e1[256] = {
@@ -4144,38 +4078,38 @@
 };
 
 static unsigned char m6e2[256] = {
-	0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0e, 0x08, 0x08, 
-	0x08, 0x08, 0x0a, 0x08, 0x0a, 0x02, 0x02, 0x08, 
-	0x02, 0x02, 0x08, 0x00, 0x02, 0x08, 0x02, 0x0b, 
-	0x08, 0x0d, 0x0f, 0x0d, 0x0c, 0x0e, 0x08, 0x0d, 
-	0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 0x0f, 0x0d, 0x0c, 
-	0x0c, 0x0a, 0x08, 0x0f, 0x0d, 0x0f, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 0x0d, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x0f, 0x0e, 0x08, 
-	0x08, 0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x0f, 0x08, 
-	0x0f, 0x08, 0x0c, 0x0f, 0x0d, 0x0c, 0x0d, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x08, 0x0f, 0x0d, 
-	0x08, 0x0c, 0x0d, 0x0d, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x09, 0x08, 0x08, 0x08, 0x0a, 0x02, 
-	0x08, 0x00, 0x08, 0x02, 0x08, 0x02, 0x0a, 0x00, 
-	0x0c, 0x0e, 0x08, 0x08, 0x00, 0x0c, 0x0c, 0x0e, 
-	0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
-	0x0e, 0x0c, 0x08, 0x0c, 0x0f, 0x0d, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 
-	0x08, 0x08, 0x0f, 0x0d, 0x08, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x0e, 0x0c, 0x0e, 0x08, 0x0f, 0x0e, 
-	0x08, 0x0c, 0x0f, 0x0a, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0f, 0x0c, 0x0d, 0x0d, 0x0c, 0x0e, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x0d, 0x0c, 0x0d, 0x0e, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x0f, 0x0e, 0x0c, 0x0a, 
-	0x0c, 0x08, 0x0a, 0x08, 0x0c, 0x08, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x08, 0x02, 0x02, 0x0a, 0x00, 
-	0x0a, 0x0a, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x07, 0x04, 0x04, 
+	0x04, 0x04, 0x05, 0x04, 0x05, 0x01, 0x01, 0x04, 
+	0x01, 0x01, 0x04, 0x00, 0x01, 0x04, 0x01, 0x05, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x05, 0x04, 0x07, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x07, 0x07, 0x04, 
+	0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x04, 
+	0x07, 0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x04, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x01, 
+	0x04, 0x00, 0x04, 0x01, 0x04, 0x01, 0x05, 0x00, 
+	0x06, 0x07, 0x04, 0x04, 0x00, 0x06, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x04, 0x07, 0x06, 0x04, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x07, 0x04, 0x07, 0x07, 
+	0x04, 0x06, 0x07, 0x05, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x05, 
+	0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x05, 0x00, 
+	0x05, 0x05, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m6f1[256] = {
@@ -4214,38 +4148,38 @@
 };
 
 static unsigned char m6f2[256] = {
-	0x0c, 0x0d, 0x0f, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0e, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x09, 0x0c, 0x0e, 0x0f, 0x0f, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0d, 0x0d, 0x0a, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0e, 0x0e, 0x0f, 0x0d, 0x0e, 0x0c, 0x0e, 
-	0x0c, 0x0f, 0x0d, 0x0e, 0x08, 0x0c, 0x0e, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x0d, 
-	0x0c, 0x0d, 0x08, 0x0c, 0x08, 0x08, 0x0a, 0x02, 
-	0x08, 0x08, 0x08, 0x02, 0x08, 0x02, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0d, 
-	0x0f, 0x08, 0x0d, 0x0d, 0x0a, 0x0c, 0x0f, 0x0d, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0d, 0x08, 0x0e, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 
-	0x0d, 0x08, 0x0e, 0x0c, 0x0a, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x08, 0x0f, 0x0c, 0x0f, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x09, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0e, 0x08, 0x0c, 0x0e, 0x0f, 0x0f, 0x08, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x08, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x08, 0x0e, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x09, 0x0c, 
-	0x0f, 0x0d, 0x0f, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x02, 0x02, 0x08, 0x0c, 0x0d, 0x08, 0x08, 
-	0x0c, 0x08, 0x09, 0x0c, 0x0c, 0x0c, 0x0e, 0x0d, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0d, 0x0d, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x00, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
+	0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x07, 0x07, 0x07, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x07, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x05, 0x01, 
+	0x04, 0x04, 0x04, 0x01, 0x04, 0x01, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x07, 0x04, 0x06, 0x06, 0x05, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x05, 0x04, 0x06, 0x06, 
+	0x07, 0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x07, 0x07, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x00, 0x01, 0x04, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x01, 0x01, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x00, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
 };
 
 static unsigned char m701[256] = {
@@ -4284,38 +4218,38 @@
 };
 
 static unsigned char m702[256] = {
-	0x0c, 0x0d, 0x08, 0x08, 0x0c, 0x0d, 0x0d, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0f, 0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0f, 0x0f, 0x0d, 0x0d, 0x09, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0d, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x00, 0x02, 
-	0x01, 0x0d, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x08, 0x0d, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0a, 0x02, 0x08, 0x0a, 
-	0x0f, 0x0c, 0x08, 0x08, 0x0c, 0x0a, 0x0e, 0x08, 
-	0x0f, 0x08, 0x0c, 0x08, 0x0f, 0x0d, 0x0a, 0x0a, 
-	0x02, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x08, 0x0a, 0x0f, 0x08, 0x08, 0x08, 0x0f, 0x08, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x0e, 0x0e, 0x0e, 0x08, 
-	0x0d, 0x0f, 0x0d, 0x08, 0x02, 0x02, 0x00, 0x0c, 
-	0x08, 0x0d, 0x08, 0x08, 0x0d, 0x08, 0x08, 0x08, 
-	0x08, 0x0c, 0x08, 0x0f, 0x0f, 0x0f, 0x0e, 0x0f, 
-	0x0c, 0x0e, 0x08, 0x0f, 0x0c, 0x0c, 0x08, 0x0f, 
-	0x0f, 0x0b, 0x0c, 0x0a, 0x02, 0x02, 0x0c, 0x08, 
-	0x0a, 0x02, 0x02, 0x02, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x0e, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0a, 0x0c, 0x0d, 0x0c, 0x0b, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x08, 0x02, 0x02, 
-	0x02, 0x02, 0x08, 0x02, 0x02, 0x02, 0x08, 0x0e, 
-	0x0c, 0x09, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0f, 0x08, 0x0c, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x04, 0x00, 0x01, 
+	0x00, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x05, 0x01, 0x04, 0x05, 
+	0x07, 0x06, 0x04, 0x04, 0x06, 0x05, 0x07, 0x04, 
+	0x07, 0x04, 0x06, 0x04, 0x07, 0x06, 0x05, 0x05, 
+	0x01, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x04, 0x05, 0x07, 0x04, 0x04, 0x04, 0x07, 0x04, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x04, 0x01, 0x01, 0x00, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x04, 
+	0x04, 0x06, 0x04, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x07, 0x06, 0x06, 0x04, 0x07, 
+	0x07, 0x05, 0x06, 0x05, 0x01, 0x01, 0x06, 0x04, 
+	0x05, 0x01, 0x01, 0x01, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x04, 0x01, 0x01, 
+	0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 0x04, 0x07, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 
 };
 
 static unsigned char m711[256] = {
@@ -4354,38 +4288,38 @@
 };
 
 static unsigned char m712[256] = {
-	0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x08, 
-	0x08, 0x0f, 0x0e, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 
-	0x0e, 0x08, 0x08, 0x0e, 0x00, 0x02, 0x02, 0x0c, 
-	0x02, 0x0f, 0x0f, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x08, 
-	0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x0e, 
-	0x0f, 0x0e, 0x0c, 0x08, 0x08, 0x08, 0x0f, 0x08, 
-	0x08, 0x08, 0x0c, 0x08, 0x00, 0x08, 0x00, 0x08, 
-	0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 0x0c, 0x0d, 
-	0x08, 0x0d, 0x0b, 0x0c, 0x0f, 0x0c, 0x0f, 0x08, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x00, 0x0d, 0x08, 
-	0x0c, 0x0d, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0d, 0x0f, 0x0f, 
-	0x0e, 0x0d, 0x0c, 0x08, 0x0d, 0x08, 0x0f, 0x08, 
-	0x0c, 0x08, 0x0e, 0x02, 0x08, 0x08, 0x08, 0x08, 
-	0x0e, 0x08, 0x0a, 0x0c, 0x08, 0x0f, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0d, 0x0f, 0x08, 0x08, 0x08, 0x08, 0x0f, 
-	0x0c, 0x08, 0x0d, 0x08, 0x0f, 0x08, 0x08, 0x0c, 
-	0x0a, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0e, 0x0c, 0x09, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0e, 0x08, 0x0e, 0x08, 0x08, 
-	0x0c, 0x0f, 0x09, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 0x0f, 0x0c, 
-	0x0d, 0x08, 0x0d, 0x08, 0x0f, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0d, 
-	0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x0d, 0x0f, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0d, 0x0f, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x00, 0x00, 
-	0x0c, 0x0e, 0x08, 0x0d, 0x0d, 0x0c, 0x0d, 0x0d, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x04, 0x04, 0x07, 0x00, 0x01, 0x01, 0x06, 
+	0x01, 0x07, 0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x04, 0x04, 0x04, 0x07, 0x04, 
+	0x04, 0x04, 0x06, 0x04, 0x00, 0x04, 0x00, 0x04, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 
+	0x04, 0x06, 0x05, 0x06, 0x07, 0x06, 0x07, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x00, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x04, 0x07, 0x04, 
+	0x06, 0x04, 0x07, 0x01, 0x04, 0x04, 0x04, 0x04, 
+	0x07, 0x04, 0x05, 0x06, 0x04, 0x07, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x04, 0x04, 0x04, 0x04, 0x07, 
+	0x06, 0x04, 0x06, 0x04, 0x07, 0x04, 0x04, 0x06, 
+	0x05, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x04, 0x07, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x07, 0x04, 0x04, 
+	0x06, 0x07, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x07, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x00, 0x00, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m721[256] = {
@@ -4424,38 +4358,38 @@
 };
 
 static unsigned char m722[256] = {
-	0x09, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x08, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0d, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0f, 0x08, 0x0f, 0x0d, 0x08, 0x08, 
-	0x0f, 0x02, 0x09, 0x00, 0x08, 0x0f, 0x0f, 0x02, 
-	0x0e, 0x0e, 0x0d, 0x0f, 0x08, 0x0f, 0x0d, 0x0e, 
-	0x09, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x0f, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0f, 0x02, 0x08, 0x0c, 
-	0x08, 0x08, 0x0f, 0x0c, 0x08, 0x08, 0x0e, 0x08, 
-	0x0d, 0x0f, 0x0c, 0x0f, 0x00, 0x0f, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x0f, 0x0c, 0x08, 0x08, 0x0a, 0x0f, 
-	0x08, 0x0f, 0x0c, 0x08, 0x0c, 0x08, 0x0e, 0x0e, 
-	0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x02, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0a, 0x0c, 0x0c, 0x0d, 0x0e, 0x0e, 
-	0x0f, 0x0f, 0x08, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x02, 0x0e, 0x0c, 0x0e, 0x0c, 0x0a, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0a, 
-	0x00, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0a, 0x0c, 0x0f, 
-	0x0e, 0x08, 0x08, 0x08, 0x0e, 0x0c, 0x0a, 0x02, 
-	0x02, 0x0a, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x0e, 0x0f, 0x0e, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x02, 0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 0x0f, 0x08, 
-	0x0f, 0x0c, 0x0e, 0x08, 0x0c, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x08, 0x02, 0x0c, 
-	0x0e, 0x0f, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0e, 0x0f, 0x0c, 0x0c, 0x0a, 0x0a, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x0e, 0x0e, 0x08, 0x0c, 0x0e, 
-	0x0f, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x0c, 0x0c, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x07, 0x06, 0x04, 0x04, 
+	0x07, 0x01, 0x04, 0x00, 0x04, 0x07, 0x07, 0x01, 
+	0x07, 0x07, 0x06, 0x07, 0x04, 0x07, 0x06, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x01, 0x04, 0x06, 
+	0x04, 0x04, 0x07, 0x06, 0x04, 0x04, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x00, 0x07, 0x06, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x04, 0x04, 0x05, 0x07, 
+	0x04, 0x07, 0x06, 0x04, 0x06, 0x04, 0x07, 0x07, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x01, 0x06, 0x06, 
+	0x06, 0x07, 0x05, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x01, 0x07, 0x06, 0x07, 0x06, 0x05, 
+	0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x05, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x05, 0x06, 0x07, 
+	0x07, 0x04, 0x04, 0x04, 0x07, 0x06, 0x05, 0x01, 
+	0x01, 0x05, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x04, 
+	0x01, 0x06, 0x06, 0x06, 0x06, 0x05, 0x07, 0x04, 
+	0x07, 0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x04, 0x01, 0x06, 
+	0x07, 0x07, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x06, 0x05, 0x05, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x07, 0x07, 0x04, 0x06, 0x07, 
+	0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m731[256] = {
@@ -4494,38 +4428,38 @@
 };
 
 static unsigned char m732[256] = {
-	0x0c, 0x0e, 0x08, 0x02, 0x08, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x08, 0x0a, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0e, 0x08, 0x0a, 0x0f, 0x0e, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x0f, 0x0f, 0x0e, 0x00, 
-	0x00, 0x02, 0x0e, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0b, 0x0b, 0x0a, 0x0c, 0x0a, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x0d, 0x0f, 
-	0x0a, 0x02, 0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0f, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0d, 0x08, 0x08, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0e, 0x0c, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x08, 0x08, 0x08, 0x08, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x0e, 0x02, 0x0c, 0x0e, 
-	0x0d, 0x08, 0x0d, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0d, 0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0d, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x08, 0x08, 0x0f, 0x08, 
-	0x08, 0x0a, 0x0c, 0x0c, 0x0d, 0x0c, 0x0f, 0x0d, 
-	0x09, 0x00, 0x00, 0x02, 0x08, 0x0c, 0x08, 0x0f, 
-	0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x09, 
-	0x0c, 0x0f, 0x08, 0x0e, 0x0c, 0x0d, 0x02, 0x0a, 
-	0x02, 0x00, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0d, 0x0a, 0x0e, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0b, 0x0f, 0x0c, 0x0d, 0x0f, 0x08, 0x0b, 
-	0x0a, 0x02, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0d, 0x0f, 0x08, 
-	0x0f, 0x08, 0x08, 0x0d, 0x09, 0x0f, 0x09, 0x0e, 
-	0x0c, 0x0f, 0x0d, 0x0c, 0x08, 0x0f, 0x0c, 0x08, 
-	0x00, 0x00, 0x02, 0x08, 0x0c, 0x0c, 0x0c, 0x09, 
-	0x0c, 0x09, 0x0c, 0x08, 0x0c, 0x0d, 0x0d, 0x0c, 
+	0x06, 0x07, 0x04, 0x01, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 0x05, 0x06, 
+	0x04, 0x06, 0x06, 0x07, 0x04, 0x05, 0x07, 0x07, 
+	0x06, 0x06, 0x04, 0x07, 0x07, 0x07, 0x07, 0x00, 
+	0x00, 0x01, 0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x04, 0x07, 0x05, 0x05, 0x05, 0x06, 0x05, 0x04, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x05, 0x01, 0x06, 0x06, 0x06, 0x04, 0x07, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 0x04, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x04, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x00, 0x00, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x01, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x07, 0x04, 0x04, 0x07, 0x04, 
+	0x04, 0x05, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x00, 0x00, 0x01, 0x04, 0x06, 0x04, 0x07, 
+	0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x07, 0x04, 0x07, 0x06, 0x06, 0x01, 0x05, 
+	0x01, 0x00, 0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x05, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x05, 0x07, 0x06, 0x06, 0x07, 0x04, 0x05, 
+	0x05, 0x01, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x07, 0x04, 0x04, 0x06, 0x04, 0x07, 0x04, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x07, 0x06, 0x04, 
+	0x00, 0x00, 0x01, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m741[256] = {
@@ -4564,38 +4498,38 @@
 };
 
 static unsigned char m742[256] = {
-	0x0c, 0x0d, 0x08, 0x0f, 0x0c, 0x0f, 0x0f, 0x0d, 
-	0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 0x00, 0x02, 
-	0x02, 0x00, 0x08, 0x09, 0x08, 0x08, 0x0c, 0x08, 
-	0x08, 0x08, 0x0e, 0x0f, 0x08, 0x0c, 0x08, 0x08, 
-	0x0d, 0x0d, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x0d, 0x0f, 0x0c, 0x0f, 0x0d, 
-	0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 
-	0x09, 0x08, 0x0d, 0x08, 0x0a, 0x08, 0x08, 0x0d, 
-	0x0d, 0x0f, 0x0c, 0x09, 0x0d, 0x08, 0x0c, 0x08, 
-	0x08, 0x08, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x0f, 0x0f, 
-	0x09, 0x08, 0x0d, 0x0c, 0x0d, 0x09, 0x08, 0x0c, 
-	0x09, 0x0d, 0x0d, 0x08, 0x08, 0x0e, 0x0c, 0x0d, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0a, 0x02, 
-	0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0e, 0x0e, 0x09, 0x0f, 0x08, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x08, 0x08, 0x02, 0x08, 
-	0x0e, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x08, 0x0f, 0x08, 0x0f, 0x0d, 
-	0x0c, 0x0d, 0x08, 0x0d, 0x08, 0x0d, 0x0c, 0x0f, 
-	0x0f, 0x0e, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x09, 0x0e, 0x0c, 0x08, 0x0d, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x09, 0x08, 
-	0x08, 0x08, 0x0d, 0x0c, 0x08, 0x08, 0x08, 0x0d, 
-	0x08, 0x08, 0x02, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x0e, 0x0c, 
-	0x0f, 0x0c, 0x0f, 0x0f, 0x0e, 0x0c, 0x0f, 0x00, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0f, 0x0a, 
-	0x00, 0x00, 0x00, 0x08, 0x0e, 0x0c, 0x0e, 0x0f, 
-	0x08, 0x08, 0x08, 0x0c, 0x00, 0x0c, 0x0c, 0x0e, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x00, 0x01, 
+	0x01, 0x00, 0x04, 0x04, 0x04, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x07, 0x07, 0x04, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x04, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x00, 
+	0x04, 0x04, 0x06, 0x04, 0x05, 0x04, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x04, 0x07, 
+	0x04, 0x07, 0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x04, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 0x05, 0x01, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x07, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x04, 0x01, 0x04, 
+	0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x07, 0x04, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x04, 0x04, 0x01, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 0x00, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x07, 0x05, 
+	0x00, 0x00, 0x00, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x04, 0x04, 0x04, 0x06, 0x00, 0x06, 0x06, 0x07, 
 };
 
 static unsigned char m751[256] = {
@@ -4634,38 +4568,38 @@
 };
 
 static unsigned char m752[256] = {
-	0x0c, 0x09, 0x0c, 0x0c, 0x0f, 0x00, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0e, 0x08, 0x0e, 
-	0x0c, 0x0f, 0x0c, 0x0e, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0f, 0x02, 0x0f, 0x09, 0x0e, 0x0c, 0x08, 0x0f, 
-	0x08, 0x0c, 0x0c, 0x09, 0x08, 0x0f, 0x0d, 0x08, 
-	0x0f, 0x0e, 0x0c, 0x0f, 0x0f, 0x0e, 0x0c, 0x0e, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x02, 0x08, 0x0f, 
-	0x0f, 0x0c, 0x0f, 0x0a, 0x00, 0x0c, 0x0e, 0x0c, 
-	0x0e, 0x08, 0x08, 0x08, 0x08, 0x02, 0x08, 0x0d, 
-	0x0e, 0x08, 0x08, 0x0e, 0x0f, 0x08, 0x0e, 0x0f, 
-	0x08, 0x09, 0x00, 0x09, 0x0f, 0x08, 0x08, 0x08, 
-	0x08, 0x0f, 0x0e, 0x0f, 0x0f, 0x0d, 0x08, 0x0c, 
-	0x00, 0x08, 0x0d, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 
-	0x08, 0x00, 0x0f, 0x0c, 0x0c, 0x08, 0x08, 0x0d, 
-	0x0d, 0x08, 0x0a, 0x00, 0x02, 0x09, 0x0d, 0x0c, 
-	0x0f, 0x0e, 0x09, 0x08, 0x08, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x08, 0x00, 0x0a, 0x0c, 0x08, 0x0f, 0x0d, 
-	0x08, 0x08, 0x0d, 0x0f, 0x0c, 0x00, 0x09, 0x0f, 
-	0x0c, 0x0f, 0x0a, 0x08, 0x0e, 0x0c, 0x02, 0x02, 
-	0x0c, 0x0e, 0x0e, 0x08, 0x08, 0x0f, 0x08, 0x02, 
-	0x02, 0x02, 0x0c, 0x0e, 0x0e, 0x0f, 0x08, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0f, 0x02, 0x00, 0x02, 0x02, 
-	0x0e, 0x0b, 0x0f, 0x0f, 0x0a, 0x0f, 0x0c, 0x08, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x0a, 0x0e, 0x0f, 0x08, 0x0f, 
-	0x02, 0x02, 0x0e, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x08, 0x0f, 0x0f, 0x02, 0x0c, 
-	0x0f, 0x0d, 0x0c, 0x0f, 0x08, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x0e, 0x0e, 0x08, 0x0e, 0x0e, 
-	0x02, 0x00, 0x02, 0x02, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0f, 0x0e, 0x0d, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0d, 0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x00, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x01, 0x07, 0x04, 0x07, 0x06, 0x04, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x04, 0x07, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x00, 0x01, 0x04, 0x07, 
+	0x07, 0x06, 0x07, 0x05, 0x00, 0x06, 0x07, 0x06, 
+	0x07, 0x04, 0x04, 0x04, 0x04, 0x01, 0x04, 0x06, 
+	0x07, 0x04, 0x04, 0x07, 0x07, 0x04, 0x07, 0x07, 
+	0x04, 0x04, 0x00, 0x04, 0x07, 0x04, 0x04, 0x04, 
+	0x04, 0x07, 0x07, 0x07, 0x07, 0x06, 0x04, 0x06, 
+	0x00, 0x04, 0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 
+	0x04, 0x00, 0x07, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x05, 0x00, 0x01, 0x04, 0x06, 0x06, 
+	0x07, 0x07, 0x04, 0x04, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x00, 0x05, 0x06, 0x04, 0x07, 0x06, 
+	0x04, 0x04, 0x06, 0x07, 0x06, 0x00, 0x04, 0x07, 
+	0x06, 0x07, 0x05, 0x04, 0x07, 0x06, 0x01, 0x01, 
+	0x06, 0x07, 0x07, 0x04, 0x04, 0x07, 0x04, 0x01, 
+	0x01, 0x01, 0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 
+	0x04, 0x04, 0x06, 0x07, 0x01, 0x00, 0x01, 0x01, 
+	0x07, 0x05, 0x07, 0x07, 0x05, 0x07, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x05, 0x07, 0x07, 0x04, 0x07, 
+	0x01, 0x01, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x04, 0x07, 0x07, 0x01, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 
+	0x01, 0x00, 0x01, 0x01, 0x04, 0x06, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 
 };
 
 static unsigned char m761[256] = {
@@ -4704,38 +4638,38 @@
 };
 
 static unsigned char m762[256] = {
-	0x0f, 0x0e, 0x08, 0x0e, 0x00, 0x02, 0x00, 0x08, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x0d, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x08, 0x0c, 0x0c, 0x0e, 0x0c, 0x02, 
-	0x02, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0f, 0x0d, 0x0f, 0x0c, 0x0f, 0x0e, 0x0f, 0x0c, 
-	0x0c, 0x0e, 0x02, 0x02, 0x08, 0x0e, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0e, 0x0e, 0x0e, 0x08, 0x08, 
-	0x0e, 0x08, 0x0c, 0x09, 0x0e, 0x0c, 0x02, 0x02, 
-	0x0a, 0x08, 0x0d, 0x0e, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0f, 0x02, 0x09, 0x08, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0a, 0x08, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x00, 0x02, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x02, 0x0d, 0x0c, 0x00, 0x08, 
-	0x08, 0x0d, 0x0c, 0x02, 0x0d, 0x0c, 0x0c, 0x0a, 
-	0x0d, 0x0c, 0x0d, 0x08, 0x08, 0x0c, 0x08, 0x08, 
-	0x0f, 0x0c, 0x00, 0x0f, 0x0d, 0x0f, 0x0f, 0x0c, 
-	0x08, 0x0c, 0x0e, 0x08, 0x0f, 0x08, 0x0f, 0x0f, 
-	0x0e, 0x0c, 0x0c, 0x0e, 0x08, 0x08, 0x0f, 0x0c, 
-	0x09, 0x02, 0x0c, 0x0f, 0x08, 0x0c, 0x0e, 0x08, 
-	0x08, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x0e, 0x08, 0x0c, 0x08, 
-	0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x02, 0x02, 0x08, 0x0e, 0x0c, 0x08, 0x08, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0f, 0x0d, 0x0c, 0x0e, 0x0f, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x08, 0x08, 0x0e, 0x0e, 0x02, 
-	0x02, 0x02, 0x0f, 0x0c, 0x0e, 0x08, 0x0b, 0x0a, 
-	0x0a, 0x08, 0x0c, 0x0f, 0x0d, 0x0c, 0x0d, 0x0f, 
-	0x08, 0x0d, 0x08, 0x0d, 0x0d, 0x0e, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0f, 0x0e, 
-	0x0c, 0x0e, 0x0f, 0x0c, 0x0f, 0x0c, 0x08, 0x0c, 
-	0x0f, 0x0e, 0x0c, 0x0c, 0x0f, 0x08, 0x0f, 0x08, 
+	0x07, 0x07, 0x04, 0x07, 0x00, 0x01, 0x00, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 0x01, 
+	0x01, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x07, 0x01, 0x01, 0x04, 0x07, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 0x04, 
+	0x07, 0x04, 0x06, 0x04, 0x07, 0x06, 0x01, 0x01, 
+	0x05, 0x04, 0x06, 0x07, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x07, 0x01, 0x04, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x05, 0x04, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x00, 0x01, 0x06, 
+	0x06, 0x06, 0x06, 0x01, 0x06, 0x06, 0x00, 0x04, 
+	0x04, 0x06, 0x06, 0x01, 0x06, 0x06, 0x06, 0x05, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 
+	0x07, 0x06, 0x00, 0x07, 0x06, 0x07, 0x07, 0x06, 
+	0x04, 0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 0x07, 
+	0x07, 0x06, 0x06, 0x07, 0x04, 0x04, 0x07, 0x06, 
+	0x04, 0x01, 0x06, 0x07, 0x04, 0x06, 0x07, 0x04, 
+	0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x01, 0x01, 0x04, 0x07, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x07, 0x06, 0x06, 0x07, 0x07, 0x04, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x07, 0x07, 0x01, 
+	0x01, 0x01, 0x07, 0x06, 0x07, 0x04, 0x05, 0x05, 
+	0x05, 0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x07, 0x04, 
 };
 
 static unsigned char m771[256] = {
@@ -4774,38 +4708,38 @@
 };
 
 static unsigned char m772[256] = {
-	0x08, 0x0f, 0x08, 0x0c, 0x0f, 0x0c, 0x08, 0x0e, 
-	0x0f, 0x0f, 0x0c, 0x0f, 0x00, 0x02, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x08, 
-	0x08, 0x0e, 0x0e, 0x0c, 0x08, 0x0c, 0x09, 0x0e, 
-	0x0f, 0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0a, 0x0c, 
-	0x0e, 0x0f, 0x08, 0x08, 0x00, 0x0e, 0x08, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x0f, 
-	0x0f, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x0b, 0x0a, 0x08, 0x0a, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x02, 0x02, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0e, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0e, 0x0f, 0x08, 0x0e, 0x0f, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x0f, 0x08, 0x08, 0x0c, 0x0e, 0x0f, 0x0f, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x00, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x0e, 0x0e, 0x0e, 0x0c, 
-	0x08, 0x0f, 0x02, 0x00, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0e, 
-	0x0e, 0x0c, 0x0e, 0x0c, 0x08, 0x0f, 0x08, 0x0e, 
-	0x0c, 0x0a, 0x0e, 0x0c, 0x0f, 0x0d, 0x08, 0x08, 
-	0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0f, 0x0d, 0x0e, 0x08, 0x0f, 
-	0x08, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x0c, 
-	0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x0e, 
-	0x0c, 0x0f, 0x08, 0x02, 0x0e, 0x0f, 0x0f, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x08, 0x08, 0x0a, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0a, 0x02, 
+	0x04, 0x07, 0x04, 0x06, 0x07, 0x06, 0x04, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x00, 0x01, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x07, 0x07, 0x06, 0x04, 0x06, 0x04, 0x07, 
+	0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 0x05, 0x06, 
+	0x07, 0x07, 0x04, 0x04, 0x00, 0x07, 0x04, 0x07, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x05, 0x05, 0x04, 0x05, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x01, 0x01, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x07, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x07, 0x04, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x07, 0x00, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x04, 0x07, 0x01, 0x00, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x07, 0x06, 0x04, 0x07, 0x04, 0x07, 
+	0x06, 0x05, 0x07, 0x06, 0x07, 0x06, 0x04, 0x04, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x00, 0x06, 0x06, 0x00, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 0x04, 0x07, 
+	0x06, 0x07, 0x04, 0x01, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x04, 0x05, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x05, 0x01, 
 };
 
 static unsigned char m781[256] = {
@@ -4844,38 +4778,38 @@
 };
 
 static unsigned char m782[256] = {
-	0x02, 0x02, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0e, 0x08, 0x08, 0x0e, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0f, 0x0c, 0x0e, 0x08, 0x02, 0x02, 
-	0x0a, 0x08, 0x02, 0x08, 0x02, 0x0e, 0x08, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0f, 0x0f, 0x0f, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x08, 0x0e, 
-	0x0e, 0x02, 0x02, 0x02, 0x02, 0x08, 0x02, 0x00, 
-	0x02, 0x00, 0x08, 0x0c, 0x08, 0x0f, 0x08, 0x0a, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0e, 0x09, 
-	0x0e, 0x08, 0x0e, 0x08, 0x08, 0x02, 0x02, 0x02, 
-	0x08, 0x00, 0x00, 0x00, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0e, 0x0f, 0x0f, 0x0e, 0x0e, 0x0d, 
-	0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x02, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x0e, 0x08, 0x08, 0x0f, 0x0b, 0x0f, 0x0c, 
-	0x08, 0x0f, 0x08, 0x0e, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0e, 0x0c, 0x0e, 0x02, 0x0a, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x0e, 0x0c, 0x0f, 0x0c, 0x0e, 0x08, 0x0f, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0e, 0x0a, 0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x08, 
-	0x08, 0x0a, 0x0d, 0x0d, 0x0d, 0x08, 0x0e, 0x08, 
-	0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0f, 0x08, 0x08, 
-	0x0c, 0x0e, 0x0f, 0x0f, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x08, 0x0e, 0x0e, 0x08, 0x00, 
-	0x08, 0x02, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x08, 0x0d, 
-	0x08, 0x08, 0x0e, 0x0c, 0x0e, 0x01, 0x08, 0x0e, 
-	0x08, 0x0c, 0x0e, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x01, 0x01, 0x07, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x04, 0x07, 0x04, 0x04, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x07, 0x04, 0x01, 0x01, 
+	0x05, 0x04, 0x01, 0x04, 0x01, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x07, 
+	0x07, 0x01, 0x01, 0x01, 0x01, 0x04, 0x01, 0x00, 
+	0x01, 0x00, 0x04, 0x06, 0x04, 0x07, 0x04, 0x05, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x04, 
+	0x07, 0x04, 0x07, 0x04, 0x04, 0x01, 0x01, 0x01, 
+	0x04, 0x00, 0x00, 0x00, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 
+	0x04, 0x06, 0x04, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x04, 0x04, 0x07, 0x05, 0x07, 0x06, 
+	0x04, 0x07, 0x04, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x07, 0x01, 0x05, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x07, 0x05, 0x07, 0x07, 0x07, 0x00, 0x00, 0x04, 
+	0x04, 0x05, 0x06, 0x06, 0x06, 0x04, 0x07, 0x04, 
+	0x04, 0x07, 0x04, 0x06, 0x06, 0x07, 0x04, 0x04, 
+	0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x04, 0x07, 0x07, 0x04, 0x00, 
+	0x04, 0x01, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x04, 0x07, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x07, 0x06, 0x07, 0x00, 0x04, 0x07, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m791[256] = {
@@ -4914,38 +4848,38 @@
 };
 
 static unsigned char m792[256] = {
-	0x08, 0x0f, 0x0c, 0x00, 0x0c, 0x0e, 0x08, 0x08, 
-	0x08, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0d, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x01, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x08, 0x00, 0x02, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x02, 0x0a, 0x0c, 0x0f, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x00, 0x0c, 0x0c, 0x0e, 0x0d, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x00, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0f, 0x0f, 
-	0x08, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 
-	0x0f, 0x0c, 0x0a, 0x0c, 0x0c, 0x0f, 0x08, 0x0e, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x02, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0a, 
-	0x02, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0a, 0x0f, 0x0c, 0x08, 0x0a, 0x02, 0x08, 0x08, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x08, 0x0d, 0x0d, 0x0f, 
-	0x0c, 0x09, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x0f, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0e, 0x0e, 0x08, 0x0f, 0x0f, 0x0d, 
-	0x0f, 0x0f, 0x08, 0x0a, 0x08, 0x0c, 0x0a, 0x08, 
-	0x0c, 0x0f, 0x09, 0x0f, 0x08, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x08, 0x08, 0x0f, 0x0c, 0x08, 
-	0x0f, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x08, 0x08, 0x0e, 0x0f, 0x08, 0x0f, 0x0f, 
-	0x08, 0x0f, 0x0c, 0x0e, 0x0c, 0x0e, 0x0c, 0x02, 
-	0x0a, 0x08, 0x08, 0x08, 0x00, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x08, 0x0c, 0x0f, 0x08, 0x02, 0x00, 0x08, 
+	0x04, 0x07, 0x06, 0x00, 0x06, 0x07, 0x04, 0x04, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x00, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x00, 0x01, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x07, 0x01, 0x05, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x00, 0x06, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x04, 0x00, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 
+	0x04, 0x04, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x05, 0x06, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 0x04, 0x01, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x05, 
+	0x01, 0x06, 0x07, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x05, 0x07, 0x06, 0x04, 0x05, 0x01, 0x04, 0x04, 
+	0x06, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x04, 0x05, 0x04, 0x06, 0x05, 0x04, 
+	0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x04, 0x04, 0x07, 0x06, 0x04, 
+	0x07, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x04, 0x07, 0x07, 0x04, 0x07, 0x07, 
+	0x04, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x01, 
+	0x05, 0x04, 0x04, 0x04, 0x00, 0x04, 0x06, 0x06, 
+	0x07, 0x04, 0x06, 0x07, 0x04, 0x01, 0x00, 0x04, 
 };
 
 static unsigned char m7a1[256] = {
@@ -4984,38 +4918,38 @@
 };
 
 static unsigned char m7a2[256] = {
-	0x0f, 0x08, 0x0e, 0x0e, 0x0c, 0x0d, 0x0a, 0x08, 
-	0x0d, 0x08, 0x0c, 0x0f, 0x0c, 0x0f, 0x0a, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 0x0f, 
-	0x0c, 0x0d, 0x0f, 0x0c, 0x0d, 0x08, 0x0e, 0x0d, 
-	0x0f, 0x08, 0x0c, 0x02, 0x00, 0x08, 0x0c, 0x08, 
-	0x0c, 0x08, 0x08, 0x0c, 0x08, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0a, 0x08, 0x08, 0x09, 0x0f, 
-	0x08, 0x0e, 0x08, 0x0f, 0x0f, 0x0f, 0x08, 0x0f, 
-	0x0d, 0x08, 0x08, 0x00, 0x0c, 0x08, 0x0f, 0x0c, 
-	0x0c, 0x09, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 0x08, 
-	0x08, 0x02, 0x00, 0x08, 0x0c, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x00, 0x08, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0c, 0x08, 0x08, 0x0f, 0x0c, 0x0f, 0x02, 
-	0x0e, 0x0f, 0x0f, 0x0c, 0x08, 0x09, 0x0c, 0x0f, 
-	0x0e, 0x0f, 0x08, 0x0a, 0x0f, 0x0c, 0x0e, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x02, 0x00, 0x0c, 
-	0x0c, 0x0a, 0x0f, 0x09, 0x0c, 0x0f, 0x0e, 0x0e, 
-	0x0f, 0x0c, 0x08, 0x08, 0x02, 0x02, 0x0c, 0x0f, 
-	0x0e, 0x08, 0x0c, 0x0c, 0x08, 0x02, 0x02, 0x08, 
-	0x0e, 0x0d, 0x0d, 0x0c, 0x0e, 0x02, 0x0d, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x08, 0x00, 0x0d, 0x0d, 0x08, 0x0d, 
-	0x08, 0x08, 0x0d, 0x0f, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x02, 0x09, 
-	0x0c, 0x0f, 0x08, 0x08, 0x08, 0x09, 0x02, 0x0f, 
-	0x0f, 0x08, 0x08, 0x0f, 0x0c, 0x0f, 0x0e, 0x08, 
-	0x08, 0x08, 0x09, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0d, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x0c, 0x08, 0x0e, 0x08, 0x0f, 
+	0x07, 0x04, 0x07, 0x07, 0x06, 0x06, 0x05, 0x04, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 0x05, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x07, 0x04, 0x06, 0x01, 0x00, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 
+	0x04, 0x07, 0x04, 0x07, 0x07, 0x07, 0x04, 0x07, 
+	0x06, 0x04, 0x04, 0x00, 0x06, 0x04, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x01, 0x00, 0x04, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x00, 0x00, 0x06, 
+	0x06, 0x06, 0x06, 0x00, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x04, 0x04, 0x07, 0x06, 0x07, 0x01, 
+	0x07, 0x07, 0x07, 0x06, 0x04, 0x04, 0x06, 0x07, 
+	0x07, 0x07, 0x04, 0x05, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x01, 0x00, 0x06, 
+	0x06, 0x05, 0x07, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x06, 0x04, 0x04, 0x01, 0x01, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x06, 0x04, 0x01, 0x01, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x01, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x04, 0x00, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x06, 0x07, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x01, 0x04, 
+	0x06, 0x07, 0x04, 0x04, 0x04, 0x04, 0x01, 0x07, 
+	0x07, 0x04, 0x04, 0x07, 0x06, 0x07, 0x07, 0x04, 
+	0x04, 0x04, 0x04, 0x06, 0x04, 0x07, 0x06, 0x07, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x06, 0x04, 0x07, 0x04, 0x07, 
 };
 
 static unsigned char m7b1[256] = {
@@ -5054,38 +4988,38 @@
 };
 
 static unsigned char m7b2[256] = {
-	0x0c, 0x0c, 0x00, 0x02, 0x0e, 0x0c, 0x0e, 0x00, 
-	0x0e, 0x0c, 0x0e, 0x0a, 0x08, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0a, 0x02, 0x08, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x08, 0x0c, 0x0f, 0x08, 
-	0x0f, 0x08, 0x0c, 0x0c, 0x0e, 0x0e, 0x0f, 0x08, 
-	0x0e, 0x08, 0x0e, 0x0e, 0x0f, 0x0d, 0x0e, 0x0c, 
-	0x0c, 0x0e, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0e, 0x09, 0x02, 0x0c, 0x02, 0x08, 0x02, 0x08, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0e, 0x0d, 0x0e, 
-	0x0c, 0x0f, 0x0c, 0x0f, 0x0f, 0x0d, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x0f, 0x08, 
-	0x0e, 0x08, 0x02, 0x02, 0x00, 0x02, 0x08, 0x08, 
-	0x0f, 0x0c, 0x0a, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x08, 0x09, 0x0c, 0x0f, 0x08, 
-	0x0c, 0x0e, 0x0e, 0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 
-	0x0c, 0x0a, 0x00, 0x0a, 0x00, 0x01, 0x02, 0x00, 
-	0x02, 0x08, 0x0c, 0x08, 0x0c, 0x0e, 0x08, 0x0d, 
-	0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x0e, 0x0c, 0x0d, 
-	0x0e, 0x0c, 0x08, 0x08, 0x0f, 0x0f, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x01, 0x0c, 0x0e, 0x0f, 0x08, 0x08, 
-	0x0c, 0x0f, 0x0a, 0x08, 0x0c, 0x08, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x0e, 0x0f, 0x08, 0x0c, 
-	0x08, 0x0f, 0x08, 0x08, 0x0f, 0x0c, 0x08, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x08, 
-	0x0d, 0x0f, 0x08, 0x08, 0x0d, 0x08, 0x0f, 0x0f, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x00, 
-	0x08, 0x02, 0x01, 0x02, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0e, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0d, 0x0e, 0x0c, 0x0c, 0x0d, 0x0e, 0x0e, 0x0c, 
-	0x0c, 0x0d, 0x0e, 0x0c, 0x08, 0x08, 0x02, 0x00, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0e, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0a, 0x0c, 0x0e, 0x0c, 
+	0x06, 0x06, 0x00, 0x01, 0x07, 0x06, 0x07, 0x00, 
+	0x07, 0x06, 0x07, 0x05, 0x04, 0x04, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x05, 0x01, 0x04, 0x04, 
+	0x06, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x04, 
+	0x07, 0x04, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x04, 0x07, 0x07, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x04, 0x04, 
+	0x07, 0x04, 0x01, 0x06, 0x01, 0x04, 0x01, 0x04, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x04, 0x07, 0x04, 0x07, 0x04, 
+	0x07, 0x04, 0x01, 0x01, 0x00, 0x01, 0x04, 0x04, 
+	0x07, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x05, 0x00, 0x05, 0x00, 0x00, 0x01, 0x00, 
+	0x01, 0x04, 0x06, 0x04, 0x06, 0x07, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 
+	0x06, 0x06, 0x00, 0x06, 0x07, 0x07, 0x04, 0x04, 
+	0x06, 0x07, 0x05, 0x04, 0x06, 0x04, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x07, 0x07, 0x04, 0x06, 
+	0x04, 0x07, 0x04, 0x04, 0x07, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x07, 0x04, 0x04, 0x06, 0x04, 0x07, 0x07, 
+	0x04, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x00, 
+	0x04, 0x01, 0x00, 0x01, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x04, 0x04, 0x01, 0x00, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 0x07, 
+	0x06, 0x06, 0x04, 0x06, 0x05, 0x06, 0x07, 0x06, 
 };
 
 static unsigned char m7c1[256] = {
@@ -5124,38 +5058,38 @@
 };
 
 static unsigned char m7c2[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x09, 0x00, 0x08, 0x08, 0x02, 0x00, 
-	0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x0e, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x0c, 0x0f, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x00, 0x08, 0x0c, 0x08, 0x08, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0d, 0x0f, 
-	0x0e, 0x02, 0x08, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0f, 0x08, 0x08, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0d, 0x00, 0x08, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0f, 0x0a, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0a, 0x0a, 0x0e, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x00, 0x09, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x00, 
-	0x00, 0x0e, 0x0f, 0x08, 0x0c, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x08, 0x08, 0x08, 0x0a, 0x0a, 0x0e, 0x0f, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0a, 0x0f, 0x08, 0x0d, 
-	0x0c, 0x08, 0x02, 0x08, 0x08, 0x00, 0x0b, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x08, 0x08, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0e, 0x0e, 0x0f, 0x0c, 
-	0x08, 0x0a, 0x08, 0x08, 0x08, 0x0e, 0x08, 0x0a, 
-	0x0e, 0x08, 0x0f, 0x0c, 0x0e, 0x0a, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0e, 0x0f, 0x0e, 
-	0x00, 0x0e, 0x08, 0x08, 0x0e, 0x0c, 0x0d, 0x0f, 
-	0x0f, 0x08, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x0d, 
-	0x0e, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x00, 0x08, 0x0f, 0x08, 0x0c, 0x0d, 0x08, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x04, 0x00, 0x04, 0x04, 0x01, 0x00, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x00, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x01, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x00, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x07, 0x05, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x05, 0x05, 0x07, 0x04, 0x06, 
+	0x06, 0x06, 0x00, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x04, 0x00, 
+	0x00, 0x07, 0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x07, 0x04, 0x04, 0x04, 0x05, 0x05, 0x07, 0x07, 
+	0x04, 0x06, 0x07, 0x06, 0x05, 0x07, 0x04, 0x06, 
+	0x06, 0x04, 0x01, 0x04, 0x04, 0x00, 0x05, 0x06, 
+	0x04, 0x07, 0x07, 0x07, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x04, 0x05, 
+	0x07, 0x04, 0x07, 0x06, 0x07, 0x05, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x00, 0x07, 0x04, 0x04, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 
+	0x07, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x00, 0x04, 0x07, 0x04, 0x06, 0x06, 0x04, 
 };
 
 static unsigned char m7d1[256] = {
@@ -5194,38 +5128,38 @@
 };
 
 static unsigned char m7d2[256] = {
-	0x0d, 0x0c, 0x0d, 0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0d, 0x0c, 0x0f, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0d, 0x0f, 0x08, 0x08, 0x08, 0x00, 0x02, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x0d, 0x08, 0x0d, 0x0f, 
-	0x0d, 0x0c, 0x0c, 0x0d, 0x08, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x08, 0x08, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
-	0x08, 0x0d, 0x0d, 0x0c, 0x08, 0x08, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x0d, 0x08, 0x08, 0x09, 0x02, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 
-	0x08, 0x08, 0x00, 0x00, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x08, 0x08, 0x0e, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0d, 0x0d, 0x0e, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x08, 0x0d, 0x0d, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x0d, 0x0c, 0x0d, 0x0d, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0d, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 
-	0x08, 0x08, 0x0c, 0x08, 0x00, 0x00, 0x09, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x08, 0x0d, 0x0d, 0x0c, 
-	0x0d, 0x0d, 0x08, 0x0d, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 0x08, 0x08, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x04, 0x00, 0x01, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x01, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x04, 0x00, 0x00, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 
 };
 
 static unsigned char m7e1[256] = {
@@ -5264,38 +5198,38 @@
 };
 
 static unsigned char m7e2[256] = {
-	0x08, 0x08, 0x08, 0x0c, 0x08, 0x00, 0x00, 0x08, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x0d, 0x0d, 0x0d, 
-	0x0c, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 
-	0x00, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 0x0f, 
-	0x0c, 0x0c, 0x00, 0x00, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x00, 
-	0x0c, 0x0d, 0x0d, 0x0d, 0x08, 0x0d, 0x08, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x00, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0d, 
-	0x00, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0f, 0x0d, 0x08, 0x08, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x04, 0x04, 0x04, 0x06, 0x04, 0x00, 0x00, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x00, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x00, 0x00, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x00, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x07, 0x00, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x00, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x04, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
 };
 
 static unsigned char m7f1[256] = {
@@ -5334,38 +5268,38 @@
 };
 
 static unsigned char m7f2[256] = {
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x02, 0x0c, 0x0e, 0x0e, 0x08, 0x08, 
-	0x0c, 0x00, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 
-	0x0f, 0x0e, 0x08, 0x00, 0x0f, 0x0f, 0x00, 0x0a, 
-	0x0e, 0x08, 0x02, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0e, 0x0a, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0e, 0x0f, 0x0d, 0x0c, 0x0c, 0x0f, 0x08, 
-	0x0d, 0x0a, 0x0f, 0x0c, 0x02, 0x0d, 0x0c, 0x0d, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x08, 0x02, 0x08, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 0x0f, 0x08, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x08, 0x08, 0x0f, 0x0c, 0x0c, 0x0e, 0x0f, 0x02, 
-	0x0c, 0x0e, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x0e, 
-	0x0d, 0x0d, 0x00, 0x08, 0x0c, 0x0c, 0x08, 0x0e, 
-	0x0e, 0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0e, 0x0f, 0x0c, 0x0e, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x0f, 0x0f, 0x08, 0x0c, 
-	0x02, 0x00, 0x00, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x08, 0x0e, 0x0e, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0f, 0x0e, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0e, 0x0f, 0x0c, 0x0c, 0x0c, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x04, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x01, 0x06, 0x07, 0x07, 0x04, 0x04, 
+	0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x07, 0x07, 0x04, 0x00, 0x07, 0x07, 0x00, 0x05, 
+	0x07, 0x04, 0x01, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x05, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x06, 0x05, 0x07, 0x06, 0x01, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x01, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 
+	0x04, 0x04, 0x07, 0x06, 0x06, 0x07, 0x07, 0x01, 
+	0x06, 0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x00, 0x04, 0x06, 0x06, 0x04, 0x07, 
+	0x07, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x07, 0x04, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x07, 0x04, 0x06, 
+	0x01, 0x00, 0x00, 0x06, 0x06, 0x04, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x04, 0x07, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m801[256] = {
@@ -5404,38 +5338,38 @@
 };
 
 static unsigned char m802[256] = {
-	0x0f, 0x0f, 0x08, 0x0f, 0x0e, 0x0f, 0x0f, 0x0c, 
-	0x08, 0x09, 0x08, 0x0e, 0x0f, 0x0e, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0e, 0x08, 0x0e, 0x0f, 0x0e, 0x0f, 
-	0x0f, 0x0e, 0x08, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 
-	0x0a, 0x0c, 0x02, 0x08, 0x0c, 0x0a, 0x0e, 0x02, 
-	0x0e, 0x0e, 0x0e, 0x08, 0x0c, 0x09, 0x08, 0x08, 
-	0x0c, 0x0a, 0x08, 0x0f, 0x0c, 0x0e, 0x0f, 0x0e, 
-	0x0a, 0x0c, 0x08, 0x0a, 0x08, 0x0f, 0x0c, 0x0f, 
-	0x08, 0x08, 0x02, 0x0f, 0x08, 0x08, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x0f, 0x02, 0x02, 0x02, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0e, 0x08, 0x02, 0x08, 0x0d, 0x08, 
-	0x0f, 0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 
-	0x08, 0x08, 0x00, 0x08, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x02, 0x0a, 0x08, 0x0c, 0x08, 0x08, 0x0d, 
-	0x0d, 0x0e, 0x0d, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0d, 0x0d, 0x0f, 
-	0x02, 0x08, 0x0c, 0x02, 0x0f, 0x0d, 0x0f, 0x0f, 
-	0x08, 0x0f, 0x0c, 0x0f, 0x0f, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x08, 0x0c, 0x0f, 0x08, 
-	0x0e, 0x0c, 0x0e, 0x0f, 0x0e, 0x0f, 0x08, 0x0a, 
-	0x02, 0x0f, 0x0f, 0x0c, 0x0a, 0x0f, 0x08, 0x08, 
-	0x08, 0x0f, 0x0f, 0x0e, 0x08, 0x0e, 0x0e, 0x0f, 
-	0x08, 0x0f, 0x0f, 0x08, 0x0f, 0x0c, 0x08, 0x0a, 
-	0x0c, 0x08, 0x0f, 0x08, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x0e, 0x0f, 0x0f, 0x0c, 0x0a, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0e, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0e, 0x0e, 
-	0x0c, 0x0e, 0x0f, 0x0f, 0x0e, 0x0e, 0x0f, 0x08, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x0f, 0x0f, 0x0c, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x0e, 0x08, 0x0e, 
-	0x0e, 0x0f, 0x0e, 0x0e, 0x0f, 0x0c, 0x0a, 0x08, 
-	0x0f, 0x0c, 0x0e, 0x0c, 0x0e, 0x0f, 0x0c, 0x08, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x05, 0x06, 0x01, 0x04, 0x06, 0x05, 0x07, 0x01, 
+	0x07, 0x07, 0x07, 0x04, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x05, 0x04, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x05, 0x06, 0x04, 0x05, 0x04, 0x07, 0x06, 0x07, 
+	0x04, 0x04, 0x01, 0x07, 0x04, 0x04, 0x07, 0x06, 
+	0x06, 0x04, 0x07, 0x01, 0x01, 0x01, 0x04, 0x06, 
+	0x06, 0x06, 0x07, 0x04, 0x01, 0x04, 0x06, 0x04, 
+	0x07, 0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x04, 0x00, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x01, 0x05, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x07, 
+	0x01, 0x04, 0x06, 0x01, 0x07, 0x06, 0x07, 0x07, 
+	0x04, 0x07, 0x06, 0x07, 0x07, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x07, 0x04, 0x06, 0x07, 0x04, 
+	0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x04, 0x05, 
+	0x01, 0x07, 0x07, 0x06, 0x05, 0x07, 0x04, 0x04, 
+	0x04, 0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 
+	0x04, 0x07, 0x07, 0x04, 0x07, 0x06, 0x04, 0x05, 
+	0x06, 0x04, 0x07, 0x04, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x07, 0x07, 0x07, 0x06, 0x05, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x04, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x04, 
 };
 
 static unsigned char m811[256] = {
@@ -5474,38 +5408,38 @@
 };
 
 static unsigned char m812[256] = {
-	0x0c, 0x0c, 0x0f, 0x08, 0x08, 0x0d, 0x0f, 0x09, 
-	0x0d, 0x0a, 0x0f, 0x00, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x0a, 0x0c, 0x0e, 0x08, 
-	0x0f, 0x0c, 0x0b, 0x0d, 0x08, 0x0c, 0x0e, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0d, 0x08, 0x0d, 0x0e, 0x0c, 0x08, 0x0f, 
-	0x0c, 0x0a, 0x02, 0x00, 0x08, 0x00, 0x02, 0x00, 
-	0x02, 0x0d, 0x0c, 0x08, 0x08, 0x0c, 0x0f, 0x08, 
-	0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0e, 0x0c, 
-	0x0a, 0x08, 0x0e, 0x0f, 0x0e, 0x0c, 0x0d, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0e, 0x0f, 0x0f, 0x00, 0x00, 
-	0x08, 0x02, 0x02, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x0d, 0x0e, 
-	0x08, 0x0e, 0x08, 0x0d, 0x08, 0x0a, 0x0e, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 
-	0x0d, 0x0f, 0x0f, 0x02, 0x02, 0x0a, 0x02, 0x0f, 
-	0x0f, 0x08, 0x0e, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x0f, 
-	0x08, 0x02, 0x08, 0x08, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x0d, 0x0e, 0x0f, 0x0f, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0f, 0x00, 0x00, 0x0e, 0x0c, 
-	0x0f, 0x0c, 0x0a, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0d, 0x00, 0x0c, 
-	0x08, 0x0c, 0x0f, 0x0e, 0x0c, 0x0d, 0x0d, 0x0d, 
-	0x0f, 0x0a, 0x0f, 0x0e, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x08, 0x0c, 0x0e, 0x08, 0x0e, 0x0d, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x00, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x08, 0x0d, 0x0c, 0x0f, 
-	0x0d, 0x0c, 0x0f, 0x08, 0x0e, 0x0f, 0x0c, 0x08, 
-	0x08, 0x08, 0x0c, 0x0f, 0x0f, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0f, 0x0f, 0x08, 0x0f, 0x0c, 
+	0x06, 0x06, 0x07, 0x04, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x05, 0x07, 0x00, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x05, 0x06, 0x07, 0x04, 
+	0x07, 0x06, 0x05, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x07, 0x06, 0x04, 0x07, 
+	0x06, 0x05, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 
+	0x01, 0x06, 0x06, 0x04, 0x04, 0x06, 0x07, 0x04, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x05, 0x04, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x00, 0x00, 
+	0x04, 0x01, 0x01, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x07, 0x04, 0x06, 0x04, 0x05, 0x07, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x01, 0x01, 0x05, 0x01, 0x07, 
+	0x07, 0x04, 0x07, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 
+	0x04, 0x01, 0x04, 0x04, 0x04, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x07, 0x00, 0x00, 0x07, 0x06, 
+	0x07, 0x06, 0x05, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x00, 0x06, 
+	0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x05, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x06, 0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x00, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x07, 0x04, 0x07, 0x07, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x07, 0x07, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x07, 0x06, 
 };
 
 static unsigned char m821[256] = {
@@ -5544,38 +5478,38 @@
 };
 
 static unsigned char m822[256] = {
-	0x0e, 0x0e, 0x0e, 0x08, 0x0e, 0x0f, 0x02, 0x0d, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x0f, 0x0f, 0x08, 0x08, 
-	0x0e, 0x0c, 0x0f, 0x08, 0x0e, 0x0c, 0x0c, 0x00, 
-	0x08, 0x08, 0x08, 0x0f, 0x0f, 0x0c, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x0e, 0x02, 0x08, 0x0c, 0x08, 0x08, 
-	0x0e, 0x08, 0x0f, 0x0f, 0x0f, 0x0a, 0x00, 0x0e, 
-	0x02, 0x02, 0x0c, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 
-	0x0e, 0x0f, 0x0c, 0x02, 0x0c, 0x0c, 0x02, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x08, 0x0e, 0x0d, 0x08, 0x0f, 
-	0x08, 0x0e, 0x08, 0x0e, 0x08, 0x00, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0d, 0x0e, 0x0c, 0x0c, 0x00, 0x0c, 0x0e, 
-	0x00, 0x0c, 0x08, 0x0c, 0x0d, 0x08, 0x0d, 0x08, 
-	0x0e, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 
-	0x02, 0x0d, 0x0f, 0x0a, 0x0e, 0x0c, 0x09, 0x0c, 
-	0x0d, 0x0a, 0x02, 0x08, 0x0c, 0x0e, 0x0f, 0x0e, 
-	0x0c, 0x08, 0x02, 0x0c, 0x0e, 0x0c, 0x08, 0x08, 
-	0x02, 0x08, 0x0e, 0x0f, 0x08, 0x0f, 0x0f, 0x0e, 
-	0x0c, 0x0e, 0x0f, 0x0c, 0x0c, 0x08, 0x08, 0x02, 
-	0x0e, 0x0f, 0x0d, 0x0c, 0x0a, 0x0f, 0x0c, 0x0f, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 0x0f, 0x0b, 0x0c, 
-	0x0e, 0x0f, 0x0a, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0e, 0x0f, 0x08, 0x0f, 0x0e, 0x0c, 0x0c, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0d, 0x0d, 0x0f, 0x0e, 0x09, 
-	0x0c, 0x0a, 0x0c, 0x0c, 0x0a, 0x08, 0x00, 0x02, 
-	0x02, 0x08, 0x0a, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x08, 0x0f, 0x0f, 0x0e, 0x0f, 0x0f, 0x0c, 0x0f, 
-	0x0a, 0x0c, 0x08, 0x0f, 0x0e, 0x08, 0x0f, 0x0f, 
-	0x0e, 0x0f, 0x08, 0x0e, 0x0e, 0x0f, 0x0f, 0x0d, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x0e, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0a, 
-	0x08, 0x0e, 0x0c, 0x0e, 0x08, 0x09, 0x0d, 0x08, 
+	0x07, 0x07, 0x07, 0x04, 0x07, 0x07, 0x01, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x04, 
+	0x07, 0x06, 0x07, 0x04, 0x07, 0x06, 0x06, 0x00, 
+	0x04, 0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x07, 0x01, 0x04, 0x06, 0x04, 0x04, 
+	0x07, 0x04, 0x07, 0x07, 0x07, 0x05, 0x00, 0x07, 
+	0x01, 0x01, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x06, 0x01, 0x06, 0x06, 0x01, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x07, 0x06, 0x04, 0x07, 
+	0x04, 0x07, 0x04, 0x07, 0x04, 0x00, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x06, 0x06, 0x00, 0x06, 0x07, 
+	0x00, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x01, 0x06, 0x07, 0x05, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x05, 0x01, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x06, 0x04, 0x01, 0x06, 0x07, 0x06, 0x04, 0x04, 
+	0x01, 0x04, 0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x04, 0x01, 
+	0x07, 0x07, 0x06, 0x06, 0x05, 0x07, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x05, 0x06, 
+	0x07, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 
+	0x06, 0x05, 0x06, 0x06, 0x05, 0x04, 0x00, 0x01, 
+	0x01, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x04, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x05, 0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x06, 0x04, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x05, 
+	0x04, 0x07, 0x06, 0x07, 0x04, 0x04, 0x06, 0x04, 
 };
 
 static unsigned char m831[256] = {
@@ -5614,38 +5548,38 @@
 };
 
 static unsigned char m832[256] = {
-	0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 
-	0x0e, 0x0f, 0x08, 0x08, 0x0e, 0x0c, 0x0a, 0x02, 
-	0x08, 0x02, 0x08, 0x00, 0x02, 0x02, 0x0c, 0x0f, 
-	0x08, 0x0c, 0x0a, 0x0e, 0x0e, 0x08, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0f, 0x0c, 0x0c, 0x0f, 0x0e, 0x0e, 0x08, 0x0f, 
-	0x08, 0x0f, 0x0c, 0x0e, 0x0f, 0x0f, 0x0f, 0x0c, 
-	0x0f, 0x0f, 0x0e, 0x0c, 0x0e, 0x08, 0x08, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0a, 0x0f, 
-	0x0c, 0x0f, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0e, 0x0f, 0x0f, 0x0c, 0x0e, 0x08, 0x0c, 0x08, 
-	0x08, 0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x02, 0x02, 0x08, 0x0a, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x08, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0e, 0x08, 0x0c, 0x0f, 0x0e, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0a, 0x0e, 0x0c, 
-	0x0c, 0x0f, 0x0d, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x0e, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x0e, 0x0a, 0x0c, 0x0f, 0x08, 
-	0x0e, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x0a, 
-	0x02, 0x0a, 0x02, 0x00, 0x02, 0x0f, 0x08, 0x0c, 
-	0x0e, 0x0f, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 
-	0x0c, 0x0d, 0x0f, 0x0c, 0x0f, 0x08, 0x0c, 0x0e, 
-	0x08, 0x0c, 0x08, 0x09, 0x0e, 0x0c, 0x0f, 0x0c, 
-	0x0e, 0x0c, 0x08, 0x0c, 0x0f, 0x0e, 0x0c, 0x0e, 
-	0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 
-	0x0c, 0x0f, 0x0e, 0x0d, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x0f, 0x0f, 0x0f, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 
-	0x0e, 0x0f, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x07, 0x06, 0x05, 0x01, 
+	0x04, 0x01, 0x04, 0x00, 0x01, 0x01, 0x06, 0x07, 
+	0x04, 0x06, 0x05, 0x07, 0x07, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 0x07, 
+	0x04, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x04, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x05, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x06, 0x07, 0x04, 0x06, 0x04, 
+	0x04, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x01, 0x01, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x05, 0x07, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x05, 0x06, 0x07, 0x04, 
+	0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x07, 0x04, 0x04, 0x06, 0x06, 
+	0x07, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x05, 
+	0x01, 0x05, 0x01, 0x00, 0x01, 0x07, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 
+	0x04, 0x06, 0x04, 0x04, 0x07, 0x06, 0x07, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x07, 0x07, 0x06, 0x07, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
 };
 
 static unsigned char m841[256] = {
@@ -5684,38 +5618,38 @@
 };
 
 static unsigned char m842[256] = {
-	0x08, 0x0e, 0x08, 0x0f, 0x0f, 0x08, 0x0e, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x0e, 0x0f, 0x0f, 0x0f, 0x0e, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x08, 
-	0x0a, 0x00, 0x00, 0x0c, 0x02, 0x02, 0x08, 0x08, 
-	0x00, 0x08, 0x00, 0x0c, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x0d, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0e, 0x0f, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0f, 
-	0x08, 0x0e, 0x0e, 0x0f, 0x0a, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0f, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0e, 0x08, 0x0f, 0x0f, 0x0e, 0x0c, 0x0d, 
-	0x0c, 0x0a, 0x08, 0x0e, 0x0c, 0x0f, 0x0e, 0x0c, 
-	0x0e, 0x0c, 0x0f, 0x08, 0x08, 0x0c, 0x0c, 0x08, 
-	0x08, 0x08, 0x0e, 0x08, 0x08, 0x00, 0x0c, 0x02, 
-	0x0a, 0x02, 0x00, 0x02, 0x02, 0x0c, 0x0e, 0x0c, 
-	0x0d, 0x0c, 0x08, 0x08, 0x0d, 0x08, 0x08, 0x0e, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x0f, 0x08, 0x0e, 0x08, 0x0c, 0x08, 
-	0x0f, 0x0e, 0x0e, 0x0d, 0x0d, 0x0a, 0x08, 0x0f, 
-	0x0d, 0x0e, 0x0d, 0x08, 0x0f, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0f, 0x0e, 0x0d, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x0e, 0x0f, 0x0c, 0x0e, 0x0c, 0x08, 0x0e, 0x0c, 
-	0x08, 0x00, 0x09, 0x0c, 0x00, 0x02, 0x08, 0x02, 
-	0x02, 0x08, 0x08, 0x02, 0x08, 0x02, 0x02, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x08, 0x0d, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 
+	0x04, 0x07, 0x04, 0x07, 0x07, 0x04, 0x07, 0x06, 
+	0x04, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x05, 0x00, 0x00, 0x06, 0x01, 0x01, 0x04, 0x04, 
+	0x00, 0x04, 0x00, 0x06, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 0x07, 
+	0x04, 0x07, 0x07, 0x07, 0x05, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x05, 0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x04, 0x04, 0x07, 0x04, 0x04, 0x00, 0x06, 0x01, 
+	0x05, 0x01, 0x00, 0x01, 0x01, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x07, 0x04, 0x07, 0x04, 0x06, 0x04, 
+	0x07, 0x07, 0x07, 0x06, 0x06, 0x05, 0x04, 0x07, 
+	0x06, 0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x06, 0x04, 0x07, 0x06, 
+	0x04, 0x00, 0x04, 0x06, 0x00, 0x01, 0x04, 0x01, 
+	0x01, 0x04, 0x04, 0x01, 0x04, 0x01, 0x01, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 
 };
 
 static unsigned char m851[256] = {
@@ -5754,38 +5688,38 @@
 };
 
 static unsigned char m852[256] = {
-	0x0c, 0x08, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0f, 0x0d, 0x0c, 0x0c, 0x0f, 
-	0x0d, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x0d, 0x0e, 
-	0x0c, 0x0f, 0x08, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0f, 0x0d, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x00, 0x02, 
-	0x0a, 0x02, 0x02, 0x0e, 0x02, 0x0f, 0x0c, 0x09, 
-	0x0c, 0x0d, 0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0f, 0x0e, 0x08, 0x08, 0x0c, 0x0d, 0x08, 
-	0x08, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x08, 0x0c, 0x0e, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0d, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x08, 0x0c, 0x02, 0x08, 0x02, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0e, 0x0e, 0x0c, 0x08, 0x0e, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0c, 0x0d, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0d, 0x0c, 
-	0x0f, 0x0d, 0x0f, 0x08, 0x08, 0x00, 0x02, 0x0f, 
-	0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0e, 0x0d, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0b, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x08, 0x0d, 0x0d, 0x0f, 
-	0x0e, 0x0c, 0x0c, 0x02, 0x08, 0x0f, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0f, 0x0d, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0f, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0f, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0d, 0x0f, 0x08, 0x0c, 0x0c, 0x0f, 
+	0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x00, 0x01, 
+	0x05, 0x01, 0x01, 0x07, 0x01, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x01, 0x04, 0x01, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x06, 0x04, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x04, 0x00, 0x01, 0x07, 
+	0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x01, 0x04, 0x07, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 
 };
 
 static unsigned char m861[256] = {
@@ -5824,38 +5758,38 @@
 };
 
 static unsigned char m862[256] = {
-	0x0c, 0x0c, 0x09, 0x08, 0x0c, 0x0e, 0x0d, 0x0d, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x08, 0x0e, 0x00, 0x08, 0x00, 0x08, 0x0b, 0x0d, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x08, 0x0e, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x08, 0x08, 0x0c, 0x00, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0e, 0x0f, 0x02, 
-	0x0f, 0x0a, 0x0c, 0x0c, 0x0f, 0x0d, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0a, 0x0d, 0x0d, 0x08, 0x0f, 0x0d, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0a, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x0f, 0x0e, 0x0e, 0x0e, 0x0a, 0x0a, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0f, 0x0e, 0x0f, 0x0e, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x0e, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 0x08, 0x0e, 
-	0x0e, 0x0f, 0x0e, 0x00, 0x02, 0x08, 0x08, 0x0e, 
-	0x0e, 0x0e, 0x08, 0x0c, 0x0e, 0x0e, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x0e, 0x0a, 0x0f, 0x0c, 0x00, 0x02, 0x0a, 
-	0x0e, 0x0e, 0x08, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x0f, 0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 0x0f, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0f, 0x0a, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0e, 0x0c, 0x0c, 0x08, 0x08, 0x0f, 0x08, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x04, 0x07, 0x00, 0x04, 0x00, 0x04, 0x05, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x00, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x07, 0x01, 
+	0x07, 0x05, 0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x05, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x05, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x07, 0x07, 0x07, 0x07, 0x05, 0x05, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x07, 0x07, 0x07, 0x07, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x07, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x00, 0x01, 0x04, 0x04, 0x07, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x07, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x05, 0x07, 0x06, 0x00, 0x01, 0x05, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x07, 0x04, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 0x05, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x04, 0x04, 0x07, 0x04, 
 };
 
 static unsigned char m871[256] = {
@@ -5894,38 +5828,38 @@
 };
 
 static unsigned char m872[256] = {
-	0x0f, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0f, 0x0e, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0e, 0x0e, 0x08, 0x0a, 0x08, 0x02, 
-	0x0f, 0x0c, 0x0f, 0x0c, 0x0f, 0x08, 0x0e, 0x08, 
-	0x0c, 0x0e, 0x0e, 0x0e, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0c, 0x08, 0x0c, 0x0c, 0x0e, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x0c, 0x08, 0x0e, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0a, 
-	0x02, 0x02, 0x08, 0x00, 0x0e, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0d, 0x0c, 0x0f, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0e, 0x0c, 0x0c, 0x0e, 0x0e, 0x0e, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0a, 0x08, 0x08, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0e, 0x0a, 0x0a, 0x02, 0x00, 
-	0x00, 0x0c, 0x0f, 0x0e, 0x0c, 0x0e, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x08, 0x0a, 0x08, 0x0f, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x00, 0x00, 
-	0x02, 0x08, 0x0c, 0x0e, 0x0e, 0x0e, 0x0c, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0e, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0e, 0x08, 
-	0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x08, 0x08, 0x00, 
-	0x00, 0x0e, 0x0e, 0x0e, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x0d, 0x0c, 0x0a, 0x0d, 
-	0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0d, 0x0c, 0x08, 0x0f, 0x0c, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x04, 0x06, 0x07, 0x07, 0x04, 0x05, 0x04, 0x01, 
+	0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 
+	0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x07, 0x04, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x04, 0x07, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x04, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x05, 
+	0x01, 0x01, 0x04, 0x00, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x05, 0x04, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x05, 0x05, 0x01, 0x00, 
+	0x00, 0x06, 0x07, 0x07, 0x06, 0x07, 0x04, 0x06, 
+	0x07, 0x06, 0x04, 0x05, 0x04, 0x07, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x00, 0x00, 
+	0x01, 0x04, 0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x04, 0x04, 0x00, 
+	0x00, 0x07, 0x07, 0x07, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x05, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 
 };
 
 static unsigned char m881[256] = {
@@ -5964,38 +5898,38 @@
 };
 
 static unsigned char m882[256] = {
-	0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0e, 0x0e, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0e, 0x0f, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0e, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0e, 0x08, 0x0d, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x0c, 0x0e, 0x0a, 0x09, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 0x08, 
-	0x08, 0x08, 0x0d, 0x0d, 0x02, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x0f, 0x0c, 0x0d, 0x08, 0x0d, 0x08, 0x08, 
-	0x08, 0x0f, 0x0f, 0x0f, 0x02, 0x02, 0x08, 0x0c, 
-	0x0f, 0x0e, 0x0c, 0x0f, 0x02, 0x0c, 0x0a, 0x0c, 
-	0x0f, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0e, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x0f, 0x0c, 0x0a, 0x02, 0x00, 0x08, 
-	0x0f, 0x0c, 0x08, 0x0f, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x0f, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 0x08, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x0e, 0x08, 0x0e, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0f, 0x0c, 0x02, 0x00, 0x00, 
-	0x00, 0x0e, 0x0c, 0x08, 0x09, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0f, 0x0f, 0x00, 0x00, 0x02, 0x02, 0x00, 
-	0x00, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0d, 
-	0x0c, 0x08, 0x0e, 0x08, 0x0f, 0x0f, 0x0c, 0x0c, 
-	0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0f, 
-	0x08, 0x0d, 0x02, 0x02, 0x02, 0x02, 0x08, 0x0c, 
-	0x0f, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x0e, 0x0c, 0x0f, 0x0f, 0x09, 0x0c, 0x0c, 
-	0x0f, 0x0e, 0x0c, 0x0c, 0x0e, 0x0d, 0x0e, 0x08, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 
+	0x04, 0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x07, 0x05, 0x04, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x01, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x07, 0x07, 0x07, 0x01, 0x01, 0x04, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x01, 0x06, 0x05, 0x06, 
+	0x07, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x07, 0x06, 0x05, 0x01, 0x00, 0x04, 
+	0x07, 0x06, 0x04, 0x07, 0x06, 0x07, 0x06, 0x04, 
+	0x04, 0x06, 0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x05, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x04, 0x07, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x01, 0x00, 0x00, 
+	0x00, 0x07, 0x06, 0x04, 0x04, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x07, 0x07, 0x00, 0x00, 0x01, 0x01, 0x00, 
+	0x00, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x07, 0x04, 0x07, 0x07, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x06, 0x01, 0x01, 0x01, 0x01, 0x04, 0x06, 
+	0x07, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x04, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 
 };
 
 static unsigned char m891[256] = {
@@ -6034,38 +5968,38 @@
 };
 
 static unsigned char m892[256] = {
-	0x08, 0x0c, 0x0e, 0x08, 0x00, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0f, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0f, 0x0e, 0x0a, 0x00, 0x00, 0x0c, 0x0c, 
-	0x08, 0x0e, 0x0c, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x02, 0x0c, 0x0f, 0x0c, 
-	0x0d, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0f, 0x0c, 0x08, 0x0f, 0x00, 0x0c, 0x00, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x00, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0e, 0x08, 
-	0x00, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 0x0f, 
-	0x00, 0x0f, 0x0c, 0x0f, 0x08, 0x0c, 0x0f, 0x09, 
-	0x0c, 0x08, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x0d, 
-	0x08, 0x08, 0x08, 0x0d, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x08, 0x09, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x02, 0x02, 0x0f, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 
-	0x08, 0x0c, 0x0e, 0x0c, 0x0e, 0x0c, 0x02, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 0x0e, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x08, 0x02, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
+	0x04, 0x06, 0x07, 0x04, 0x00, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x05, 0x00, 0x00, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x01, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x07, 0x06, 0x04, 0x07, 0x00, 0x06, 0x00, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x00, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 0x04, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x07, 
+	0x00, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x04, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x01, 0x01, 0x07, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x01, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 0x01, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
 };
 
 static unsigned char m8a1[256] = {
@@ -6104,38 +6038,38 @@
 };
 
 static unsigned char m8a2[256] = {
-	0x0f, 0x00, 0x0d, 0x0d, 0x0c, 0x08, 0x08, 0x0e, 
-	0x0d, 0x08, 0x0d, 0x08, 0x0d, 0x08, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0d, 0x0d, 
-	0x0d, 0x08, 0x00, 0x0d, 0x08, 0x0d, 0x0c, 0x0d, 
-	0x08, 0x08, 0x0c, 0x0d, 0x08, 0x0d, 0x08, 0x0c, 
-	0x08, 0x08, 0x0d, 0x08, 0x0c, 0x0d, 0x08, 0x08, 
-	0x0c, 0x0d, 0x08, 0x00, 0x0d, 0x08, 0x0d, 0x08, 
-	0x08, 0x0c, 0x0d, 0x0d, 0x0c, 0x08, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0e, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x08, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x08, 0x0d, 0x00, 
-	0x0d, 0x0c, 0x0d, 0x0d, 0x08, 0x08, 0x0d, 0x08, 
-	0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 0x0d, 0x08, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 
-	0x08, 0x02, 0x02, 0x0c, 0x0d, 0x0d, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0f, 0x08, 0x0d, 0x0c, 0x08, 
-	0x0d, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0d, 0x08, 
-	0x0d, 0x0d, 0x08, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x0d, 0x08, 0x0d, 0x0c, 0x08, 0x08, 0x00, 0x08, 
-	0x0d, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x0d, 0x08, 0x0d, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x00, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x0d, 
-	0x0c, 0x08, 0x09, 0x0d, 0x08, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x0d, 0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 
+	0x07, 0x00, 0x06, 0x06, 0x06, 0x04, 0x04, 0x07, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x00, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x04, 0x00, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 0x00, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x01, 0x01, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x00, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
 };
 
 static unsigned char m8b1[256] = {
@@ -6174,38 +6108,38 @@
 };
 
 static unsigned char m8b2[256] = {
-	0x0d, 0x0d, 0x0d, 0x08, 0x0d, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x0d, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0d, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 0x0d, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x00, 0x0d, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 0x0d, 
-	0x0d, 0x08, 0x00, 0x08, 0x0d, 0x08, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x00, 
-	0x09, 0x08, 0x0d, 0x0d, 0x0c, 0x0c, 0x0d, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x00, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x00, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
 };
 
 static unsigned char m8c1[256] = {
@@ -6244,38 +6178,38 @@
 };
 
 static unsigned char m8c2[256] = {
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x0f, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x08, 0x0c, 0x0f, 0x0e, 
-	0x0d, 0x0e, 0x0d, 0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0f, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0f, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0f, 0x0f, 0x0c, 0x08, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0f, 0x08, 0x0c, 0x0e, 0x0c, 0x08, 
-	0x08, 0x0e, 0x0f, 0x08, 0x0f, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0d, 0x08, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x08, 0x08, 0x0d, 
-	0x0d, 0x08, 0x0c, 0x0d, 0x0d, 0x0c, 0x0d, 0x0d, 
-	0x0d, 0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x08, 0x0d, 
-	0x0d, 0x08, 0x0d, 0x08, 0x0c, 0x08, 0x00, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x08, 0x0d, 0x0c, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 0x08, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x07, 0x06, 0x06, 
+	0x04, 0x04, 0x07, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x07, 0x07, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x00, 0x06, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x04, 
+	0x04, 0x07, 0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x00, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
 };
 
 static unsigned char m8d1[256] = {
@@ -6314,38 +6248,38 @@
 };
 
 static unsigned char m8d2[256] = {
-	0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x0d, 0x0c, 0x0d, 
-	0x0d, 0x0c, 0x0d, 0x08, 0x08, 0x0d, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x0f, 0x08, 0x0f, 0x0e, 
-	0x0c, 0x0c, 0x00, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x0c, 0x0f, 0x0f, 0x02, 0x0e, 0x0f, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0e, 0x08, 0x08, 0x0e, 0x0f, 0x08, 0x08, 
-	0x08, 0x0c, 0x0f, 0x0a, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0e, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x02, 0x0c, 0x0f, 0x0e, 0x0e, 0x0c, 0x0c, 
-	0x02, 0x0c, 0x0f, 0x08, 0x0e, 0x08, 0x0f, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x0a, 0x02, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0f, 0x0f, 0x0c, 0x0e, 0x0f, 
-	0x0c, 0x0e, 0x08, 0x0c, 0x08, 0x0c, 0x0e, 0x0e, 
-	0x0c, 0x0c, 0x0e, 0x0f, 0x0c, 0x0f, 0x02, 0x0e, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x0e, 0x00, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x0e, 0x0e, 0x0e, 0x08, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x0e, 0x02, 0x0c, 0x0e, 0x0c, 0x0c, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x07, 0x04, 0x07, 0x07, 
+	0x06, 0x06, 0x00, 0x07, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x01, 0x07, 0x07, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x06, 0x07, 0x04, 0x04, 0x07, 0x07, 0x04, 0x04, 
+	0x04, 0x06, 0x07, 0x05, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x07, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x01, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x01, 0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 0x07, 
+	0x04, 0x06, 0x06, 0x05, 0x01, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x04, 0x07, 0x07, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 0x07, 0x07, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x07, 0x01, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x00, 0x06, 0x06, 
+	0x07, 0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x06, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x07, 0x01, 0x06, 0x07, 0x06, 0x06, 
 };
 
 static unsigned char m8e1[256] = {
@@ -6384,38 +6318,38 @@
 };
 
 static unsigned char m8e2[256] = {
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x08, 0x0e, 0x0f, 0x08, 0x02, 0x0c, 0x00, 0x0f, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0f, 0x0e, 
-	0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0e, 0x0b, 0x0c, 0x02, 0x00, 0x0e, 0x02, 
-	0x0d, 0x0e, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x0a, 0x08, 0x0c, 0x0e, 0x0c, 0x0c, 
-	0x0e, 0x0e, 0x0f, 0x08, 0x0f, 0x0c, 0x08, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0a, 0x02, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x08, 0x0e, 0x0c, 0x08, 0x0e, 0x0e, 0x08, 0x0e, 
-	0x0a, 0x08, 0x0e, 0x0c, 0x0f, 0x08, 0x0f, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0e, 0x00, 0x00, 0x02, 
-	0x00, 0x0f, 0x0c, 0x08, 0x0c, 0x0e, 0x0c, 0x0f, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x02, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x00, 0x02, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0f, 0x0f, 0x08, 0x08, 0x0a, 
-	0x08, 0x08, 0x0e, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x08, 0x08, 0x0e, 0x00, 0x08, 0x0c, 0x08, 0x08, 
-	0x0d, 0x08, 0x0c, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x00, 0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0a, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x00, 0x00, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0d, 0x0c, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x04, 0x01, 0x06, 0x00, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x05, 0x06, 0x01, 0x00, 0x07, 0x01, 
+	0x06, 0x07, 0x04, 0x06, 0x06, 0x07, 0x06, 0x04, 
+	0x06, 0x07, 0x05, 0x04, 0x06, 0x07, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x04, 0x07, 0x06, 0x04, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x05, 0x01, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x04, 0x07, 0x06, 0x04, 0x07, 0x07, 0x04, 0x07, 
+	0x05, 0x04, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x00, 0x00, 0x01, 
+	0x00, 0x07, 0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 
+	0x07, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x00, 0x01, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x04, 0x05, 
+	0x04, 0x04, 0x07, 0x04, 0x04, 0x00, 0x04, 0x04, 
+	0x04, 0x04, 0x07, 0x00, 0x04, 0x06, 0x04, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x04, 0x00, 0x04, 0x04, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x00, 0x00, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
 };
 
 static unsigned char m8f1[256] = {
@@ -6454,38 +6388,38 @@
 };
 
 static unsigned char m8f2[256] = {
-	0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x09, 
-	0x08, 0x0d, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x08, 0x0d, 0x08, 0x08, 0x0d, 0x0d, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0c, 0x00, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x0f, 0x0f, 0x08, 0x0a, 0x0e, 
-	0x08, 0x08, 0x08, 0x0f, 0x08, 0x08, 0x0d, 0x08, 
-	0x0f, 0x02, 0x08, 0x02, 0x08, 0x0d, 0x0c, 0x0d, 
-	0x0f, 0x0f, 0x0d, 0x08, 0x0c, 0x08, 0x0a, 0x08, 
-	0x08, 0x0a, 0x00, 0x08, 0x08, 0x02, 0x0a, 0x0c, 
-	0x08, 0x0a, 0x0f, 0x08, 0x0e, 0x0f, 0x0c, 0x0a, 
-	0x0a, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0f, 0x08, 
-	0x0a, 0x0f, 0x0c, 0x0e, 0x0f, 0x0e, 0x0c, 0x0c, 
-	0x0a, 0x0a, 0x00, 0x02, 0x0a, 0x02, 0x02, 0x0a, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0e, 0x0e, 0x0f, 0x08, 
-	0x0e, 0x0a, 0x0f, 0x0f, 0x08, 0x0f, 0x0e, 0x08, 
-	0x0f, 0x08, 0x01, 0x02, 0x0c, 0x0c, 0x0c, 0x0f, 
-	0x0e, 0x0b, 0x0c, 0x0c, 0x0c, 0x0f, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x00, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x07, 0x07, 0x04, 0x05, 0x07, 
+	0x04, 0x04, 0x04, 0x07, 0x04, 0x04, 0x06, 0x04, 
+	0x07, 0x01, 0x04, 0x01, 0x04, 0x06, 0x06, 0x06, 
+	0x07, 0x07, 0x06, 0x04, 0x06, 0x04, 0x05, 0x04, 
+	0x04, 0x05, 0x00, 0x04, 0x04, 0x01, 0x05, 0x06, 
+	0x04, 0x05, 0x07, 0x04, 0x07, 0x07, 0x06, 0x05, 
+	0x05, 0x06, 0x04, 0x06, 0x04, 0x06, 0x07, 0x04, 
+	0x05, 0x07, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x05, 0x05, 0x00, 0x01, 0x05, 0x01, 0x01, 0x05, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x05, 0x07, 0x07, 0x04, 0x07, 0x07, 0x04, 
+	0x07, 0x04, 0x00, 0x01, 0x06, 0x06, 0x06, 0x07, 
+	0x07, 0x05, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 
 };
 
 static unsigned char m901[256] = {
@@ -6524,38 +6458,38 @@
 };
 
 static unsigned char m902[256] = {
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0f, 0x0f, 0x08, 
-	0x09, 0x0a, 0x02, 0x0f, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0f, 0x0f, 0x0a, 0x08, 0x0f, 0x0d, 0x0e, 0x0f, 
-	0x08, 0x0d, 0x0f, 0x0e, 0x0c, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0d, 0x0c, 0x08, 0x02, 0x00, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x0e, 0x0f, 0x0e, 
-	0x08, 0x0d, 0x0d, 0x08, 0x0c, 0x0f, 0x0e, 0x08, 
-	0x0f, 0x00, 0x08, 0x0a, 0x0f, 0x0c, 0x0f, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x08, 0x0e, 0x08, 0x08, 0x0f, 
-	0x08, 0x0c, 0x0d, 0x0d, 0x08, 0x0f, 0x0d, 0x0e, 
-	0x0f, 0x0f, 0x0e, 0x0f, 0x0d, 0x0d, 0x00, 0x02, 
-	0x0e, 0x0d, 0x08, 0x0e, 0x0d, 0x0d, 0x0d, 0x08, 
-	0x0d, 0x09, 0x0e, 0x0f, 0x08, 0x02, 0x08, 0x0c, 
-	0x0e, 0x0d, 0x08, 0x0c, 0x08, 0x0f, 0x0f, 0x0d, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0e, 0x0f, 0x0c, 0x0d, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x0d, 0x0f, 0x0c, 0x0f, 
-	0x0f, 0x0d, 0x0f, 0x0f, 0x0d, 0x0c, 0x0c, 0x0d, 
-	0x0f, 0x08, 0x0d, 0x0e, 0x08, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0f, 0x08, 0x0a, 0x0c, 0x0f, 0x08, 0x0e, 
-	0x0c, 0x0f, 0x08, 0x0e, 0x08, 0x02, 0x0c, 0x0c, 
-	0x0c, 0x0e, 0x0f, 0x0f, 0x08, 0x0c, 0x0f, 0x0c, 
-	0x09, 0x08, 0x0f, 0x08, 0x02, 0x08, 0x0a, 0x0f, 
-	0x0f, 0x0f, 0x0c, 0x0e, 0x0e, 0x0f, 0x0e, 0x08, 
-	0x0f, 0x0a, 0x02, 0x02, 0x08, 0x0c, 0x0e, 0x0c, 
-	0x08, 0x0f, 0x08, 0x0c, 0x0a, 0x0e, 0x08, 0x0e, 
-	0x0c, 0x08, 0x0f, 0x0c, 0x08, 0x08, 0x0e, 0x02, 
-	0x02, 0x02, 0x08, 0x02, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x0e, 0x0e, 0x09, 0x0c, 
-	0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x0c, 0x02, 0x02, 
-	0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x0f, 0x08, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0d, 0x08, 0x08, 
-	0x02, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0e, 0x0c, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x04, 0x05, 0x01, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x07, 0x07, 0x05, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x04, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x06, 0x06, 0x04, 0x01, 0x00, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x07, 0x07, 0x04, 
+	0x07, 0x00, 0x04, 0x05, 0x07, 0x06, 0x07, 0x06, 
+	0x04, 0x07, 0x07, 0x04, 0x07, 0x04, 0x04, 0x07, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x00, 0x01, 
+	0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x07, 0x07, 0x04, 0x01, 0x04, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x04, 0x07, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x07, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x04, 0x05, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x07, 0x04, 0x07, 0x04, 0x01, 0x06, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 0x06, 
+	0x04, 0x04, 0x07, 0x04, 0x01, 0x04, 0x05, 0x07, 
+	0x07, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x04, 
+	0x07, 0x05, 0x01, 0x01, 0x04, 0x06, 0x07, 0x06, 
+	0x04, 0x07, 0x04, 0x06, 0x05, 0x07, 0x04, 0x07, 
+	0x06, 0x04, 0x07, 0x06, 0x04, 0x04, 0x07, 0x01, 
+	0x01, 0x01, 0x04, 0x01, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 0x06, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x01, 0x01, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x04, 
+	0x01, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 
 };
 
 static unsigned char m911[256] = {
@@ -6594,38 +6528,38 @@
 };
 
 static unsigned char m912[256] = {
-	0x0c, 0x0c, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x09, 0x0c, 0x0c, 
-	0x0c, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x0e, 0x0e, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0e, 
-	0x0c, 0x0e, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x00, 0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 
-	0x0e, 0x08, 0x0f, 0x0c, 0x08, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x08, 0x0e, 0x00, 0x08, 0x02, 0x02, 0x0c, 
-	0x0c, 0x0e, 0x0f, 0x0e, 0x0e, 0x0e, 0x00, 0x08, 
-	0x0c, 0x0f, 0x0f, 0x08, 0x0f, 0x08, 0x0e, 0x0e, 
-	0x0a, 0x02, 0x0e, 0x0c, 0x0e, 0x0f, 0x0a, 0x0f, 
-	0x0f, 0x0e, 0x0c, 0x08, 0x08, 0x02, 0x02, 0x02, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0f, 
-	0x08, 0x0f, 0x0c, 0x0f, 0x0a, 0x0f, 0x08, 0x0c, 
-	0x0e, 0x0e, 0x0f, 0x0c, 0x08, 0x08, 0x08, 0x00, 
-	0x08, 0x0c, 0x0e, 0x0e, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0e, 0x0e, 0x00, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x0d, 0x0d, 0x0e, 0x0f, 0x0f, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0f, 0x0f, 0x08, 0x0c, 
-	0x00, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0f, 
-	0x00, 0x0f, 0x02, 0x0d, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0d, 0x0f, 0x00, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0d, 0x0c, 0x0c, 0x08, 0x0f, 0x0d, 0x08, 0x08, 
-	0x08, 0x00, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x0c, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x00, 0x07, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x04, 0x07, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x07, 0x00, 0x04, 0x01, 0x01, 0x06, 
+	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x04, 
+	0x06, 0x07, 0x07, 0x04, 0x07, 0x04, 0x07, 0x07, 
+	0x05, 0x01, 0x07, 0x06, 0x07, 0x07, 0x05, 0x07, 
+	0x07, 0x07, 0x06, 0x04, 0x04, 0x01, 0x01, 0x01, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x07, 0x05, 0x07, 0x04, 0x06, 
+	0x07, 0x07, 0x07, 0x06, 0x04, 0x04, 0x04, 0x00, 
+	0x04, 0x06, 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x07, 0x00, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x04, 0x06, 
+	0x00, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x00, 0x07, 0x01, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x00, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x07, 0x06, 0x04, 0x04, 
+	0x04, 0x00, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x00, 0x00, 0x00, 0x06, 0x04, 0x06, 
 };
 
 static unsigned char m921[256] = {
@@ -6664,38 +6598,38 @@
 };
 
 static unsigned char m922[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x08, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x08, 
-	0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x0d, 0x08, 0x08, 0x08, 0x08, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 
-	0x08, 0x08, 0x0c, 0x0d, 0x08, 0x08, 0x0d, 0x08, 
-	0x0c, 0x0c, 0x09, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x08, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x00, 0x0c, 0x08, 0x0a, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0d, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x08, 
-	0x08, 0x0d, 0x08, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0a, 0x08, 
-	0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x00, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x05, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
 };
 
 static unsigned char m931[256] = {
@@ -6734,38 +6668,38 @@
 };
 
 static unsigned char m932[256] = {
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0d, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0d, 0x0d, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 0x0c, 0x0d, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0d, 0x0d, 
-	0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x02, 0x08, 
-	0x08, 0x00, 0x08, 0x08, 0x00, 0x08, 0x0c, 0x0c, 
-	0x09, 0x0c, 0x0d, 0x0d, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x0e, 0x08, 0x0c, 0x0c, 0x09, 0x08, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0d, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x09, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x08, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x08, 0x0c, 0x08, 
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x01, 0x04, 
+	0x04, 0x00, 0x04, 0x04, 0x00, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x07, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x04, 0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x00, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m941[256] = {
@@ -6804,38 +6738,38 @@
 };
 
 static unsigned char m942[256] = {
-	0x0c, 0x08, 0x08, 0x0c, 0x09, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0d, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x0c, 0x00, 0x08, 0x08, 0x08, 0x09, 0x00, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 0x0c, 
-	0x0c, 0x00, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x00, 0x08, 0x0c, 0x08, 0x0c, 
-	0x08, 0x08, 0x08, 0x09, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x06, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 
+	0x06, 0x00, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x00, 0x04, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
 };
 
 static unsigned char m951[256] = {
@@ -6874,38 +6808,38 @@
 };
 
 static unsigned char m952[256] = {
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x0d, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x02, 
-	0x0d, 0x08, 0x0c, 0x0d, 0x08, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x00, 0x0d, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x08, 0x08, 0x08, 
-	0x0d, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0d, 0x0d, 0x0d, 0x08, 0x08, 
-	0x0d, 0x0c, 0x00, 0x0c, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x00, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d, 0x0d, 0x08, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x0a, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x01, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x00, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x05, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
 };
 
 static unsigned char m961[256] = {
@@ -6944,38 +6878,38 @@
 };
 
 static unsigned char m962[256] = {
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x00, 0x0f, 0x0a, 0x0c, 0x02, 
-	0x0c, 0x0f, 0x0e, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x08, 0x0f, 0x08, 0x0c, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x0e, 0x0f, 0x0a, 0x0a, 0x02, 0x02, 0x08, 
-	0x08, 0x0c, 0x0c, 0x0f, 0x0e, 0x0e, 0x08, 0x0f, 
-	0x0f, 0x08, 0x0f, 0x0c, 0x0f, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x0c, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 
-	0x0f, 0x0c, 0x08, 0x0c, 0x0e, 0x0a, 0x08, 0x08, 
-	0x0c, 0x08, 0x08, 0x0f, 0x0d, 0x0d, 0x0d, 0x0f, 
-	0x08, 0x0e, 0x0f, 0x0d, 0x0f, 0x00, 0x00, 0x02, 
-	0x02, 0x02, 0x0f, 0x0c, 0x0e, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x0e, 0x0d, 0x0e, 0x0f, 0x0f, 0x0f, 
-	0x0d, 0x08, 0x00, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0f, 0x0f, 0x0c, 
-	0x0e, 0x0c, 0x0d, 0x0f, 0x08, 0x0f, 0x0d, 0x0a, 
-	0x02, 0x0c, 0x0c, 0x0c, 0x0f, 0x0d, 0x08, 0x0e, 
-	0x0f, 0x0f, 0x08, 0x0d, 0x0f, 0x08, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0c, 0x09, 0x0c, 0x08, 0x08, 0x0f, 
-	0x0d, 0x0c, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0e, 0x0d, 0x08, 0x0e, 0x0c, 0x08, 0x0a, 0x09, 
-	0x0c, 0x0e, 0x08, 0x0d, 0x0e, 0x0a, 0x0a, 0x0c, 
-	0x0f, 0x0f, 0x0c, 0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x0d, 0x0f, 0x0f, 0x0f, 0x0a, 
-	0x08, 0x08, 0x0e, 0x0c, 0x0c, 0x0f, 0x0d, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x02, 0x0c, 0x0d, 0x0d, 0x08, 0x0c, 0x08, 0x08, 
-	0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x08, 0x08, 0x0f, 
-	0x0d, 0x0c, 0x0d, 0x02, 0x08, 0x0c, 0x0f, 0x0f, 
-	0x0c, 0x0f, 0x0c, 0x0d, 0x08, 0x0c, 0x02, 0x0c, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x00, 0x07, 0x05, 0x06, 0x01, 
+	0x06, 0x07, 0x07, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x04, 0x07, 0x04, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x07, 0x07, 0x05, 0x05, 0x01, 0x01, 0x04, 
+	0x04, 0x06, 0x06, 0x07, 0x07, 0x07, 0x04, 0x07, 
+	0x07, 0x04, 0x07, 0x06, 0x07, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x06, 0x07, 0x07, 0x07, 0x06, 0x06, 
+	0x07, 0x06, 0x04, 0x06, 0x07, 0x05, 0x04, 0x04, 
+	0x06, 0x04, 0x04, 0x07, 0x06, 0x06, 0x06, 0x07, 
+	0x04, 0x07, 0x07, 0x06, 0x07, 0x00, 0x00, 0x01, 
+	0x01, 0x01, 0x07, 0x06, 0x07, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x04, 0x00, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x07, 0x07, 0x06, 
+	0x07, 0x06, 0x06, 0x07, 0x04, 0x07, 0x06, 0x05, 
+	0x01, 0x06, 0x06, 0x06, 0x07, 0x06, 0x04, 0x07, 
+	0x07, 0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x06, 0x04, 0x07, 0x06, 0x04, 0x05, 0x04, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x05, 0x05, 0x06, 
+	0x07, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x07, 0x07, 0x07, 0x05, 
+	0x04, 0x04, 0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x01, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x07, 0x07, 0x07, 0x04, 0x04, 0x04, 0x04, 0x07, 
+	0x06, 0x06, 0x06, 0x01, 0x04, 0x06, 0x07, 0x07, 
+	0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 0x01, 0x06, 
 };
 
 static unsigned char m971[256] = {
@@ -7014,38 +6948,38 @@
 };
 
 static unsigned char m972[256] = {
-	0x0f, 0x02, 0x0c, 0x08, 0x0e, 0x0c, 0x0f, 0x0f, 
-	0x0e, 0x0e, 0x08, 0x0c, 0x08, 0x0e, 0x0e, 0x0e, 
-	0x0c, 0x0d, 0x0c, 0x0f, 0x08, 0x08, 0x0f, 0x08, 
-	0x0c, 0x0d, 0x08, 0x08, 0x0f, 0x0c, 0x0f, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x02, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x0f, 0x08, 0x08, 0x0c, 0x08, 0x08, 
-	0x0e, 0x0f, 0x0c, 0x08, 0x08, 0x0d, 0x0e, 0x0c, 
-	0x08, 0x08, 0x0d, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x08, 0x0c, 0x00, 0x08, 0x00, 0x00, 
-	0x08, 0x09, 0x0e, 0x02, 0x00, 0x08, 0x0f, 0x08, 
-	0x0c, 0x0a, 0x0c, 0x0e, 0x0d, 0x08, 0x0f, 0x08, 
-	0x0e, 0x0f, 0x0f, 0x08, 0x08, 0x02, 0x0c, 0x08, 
-	0x0c, 0x0f, 0x0c, 0x08, 0x0c, 0x09, 0x0c, 0x08, 
-	0x0c, 0x00, 0x0c, 0x0e, 0x0f, 0x08, 0x0e, 0x0d, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x00, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0f, 0x08, 0x0f, 0x0c, 0x0d, 
-	0x00, 0x02, 0x02, 0x08, 0x0e, 0x08, 0x08, 0x0c, 
-	0x0e, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0d, 0x08, 0x0c, 0x0f, 0x0c, 0x0f, 0x0c, 0x02, 
-	0x08, 0x08, 0x0a, 0x0c, 0x0a, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x08, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x0e, 0x08, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0f, 0x08, 0x0a, 0x0f, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 
+	0x07, 0x01, 0x06, 0x04, 0x07, 0x06, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x06, 0x04, 0x07, 0x07, 0x07, 
+	0x06, 0x06, 0x06, 0x07, 0x04, 0x04, 0x07, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x07, 0x06, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x07, 0x06, 0x06, 0x01, 0x06, 0x06, 
+	0x07, 0x04, 0x07, 0x04, 0x04, 0x06, 0x04, 0x04, 
+	0x07, 0x07, 0x06, 0x04, 0x04, 0x06, 0x07, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x00, 0x04, 0x00, 0x00, 
+	0x04, 0x04, 0x07, 0x01, 0x00, 0x04, 0x07, 0x04, 
+	0x06, 0x05, 0x06, 0x07, 0x06, 0x04, 0x07, 0x04, 
+	0x07, 0x07, 0x07, 0x04, 0x04, 0x01, 0x06, 0x04, 
+	0x06, 0x07, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x00, 0x06, 0x07, 0x07, 0x04, 0x07, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x00, 0x04, 
+	0x06, 0x04, 0x06, 0x07, 0x04, 0x07, 0x06, 0x06, 
+	0x00, 0x01, 0x01, 0x04, 0x07, 0x04, 0x04, 0x06, 
+	0x07, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x01, 
+	0x04, 0x04, 0x05, 0x06, 0x05, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x07, 0x04, 0x04, 
+	0x06, 0x06, 0x04, 0x07, 0x04, 0x05, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m981[256] = {
@@ -7084,38 +7018,38 @@
 };
 
 static unsigned char m982[256] = {
-	0x0d, 0x0d, 0x0d, 0x0d, 0x0c, 0x0d, 0x0d, 0x0c, 
-	0x0d, 0x08, 0x0d, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0d, 0x08, 0x08, 0x0c, 0x0d, 
-	0x0d, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x00, 0x0d, 0x08, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x0d, 0x08, 0x0d, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x09, 0x08, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x09, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x0d, 0x0c, 0x00, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x00, 0x08, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x00, 0x0c, 0x09, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x02, 0x00, 
-	0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 
-	0x02, 0x02, 0x02, 0x0d, 0x09, 0x08, 0x02, 0x0f, 
-	0x00, 0x09, 0x0d, 0x0c, 0x08, 0x0c, 0x08, 0x0e, 
-	0x02, 0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x01, 0x0d, 
-	0x08, 0x08, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0d, 0x0d, 0x0d, 0x08, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x00, 0x06, 0x04, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x06, 0x06, 0x00, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x00, 0x04, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x00, 0x06, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x01, 0x00, 
+	0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 
+	0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x01, 0x07, 
+	0x00, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x07, 
+	0x01, 0x06, 0x06, 0x06, 0x04, 0x06, 0x00, 0x06, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
 };
 
 static unsigned char m991[256] = {
@@ -7154,38 +7088,38 @@
 };
 
 static unsigned char m992[256] = {
-	0x0c, 0x08, 0x0c, 0x0d, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x08, 0x0d, 0x02, 0x08, 0x00, 
-	0x0f, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0d, 0x0c, 
-	0x09, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x08, 
-	0x08, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0d, 0x0d, 0x09, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x0f, 0x0e, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0e, 
-	0x0e, 0x0f, 0x08, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 
-	0x0f, 0x08, 0x08, 0x0c, 0x0d, 0x0d, 0x0d, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x0d, 0x0d, 0x0c, 0x08, 0x08, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x08, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x08, 0x00, 0x08, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x0d, 
-	0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0d, 0x00, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x01, 0x04, 0x00, 
+	0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x07, 
+	0x07, 0x07, 0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x07, 0x06, 0x06, 
+	0x07, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x00, 0x04, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x00, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m9a1[256] = {
@@ -7224,38 +7158,38 @@
 };
 
 static unsigned char m9a2[256] = {
-	0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x09, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0d, 
-	0x08, 0x0c, 0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x00, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0d, 
-	0x08, 0x0c, 0x0d, 0x0d, 0x08, 0x08, 0x0c, 0x0d, 
-	0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0d, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0d, 0x0c, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x0f, 0x08, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0e, 0x0e, 0x08, 0x0c, 0x0c, 0x08, 0x0a, 0x0e, 
-	0x0f, 0x0c, 0x0a, 0x0c, 0x0e, 0x08, 0x0c, 0x0c, 
-	0x0e, 0x0e, 0x0e, 0x08, 0x08, 0x02, 0x0c, 0x0c, 
-	0x08, 0x08, 0x0c, 0x02, 0x02, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0e, 0x0c, 0x0f, 0x0d, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x08, 0x08, 0x08, 0x0c, 0x08, 0x08, 0x0e, 
-	0x08, 0x0e, 0x08, 0x0c, 0x08, 0x09, 0x0e, 0x0c, 
-	0x08, 0x08, 0x08, 0x0e, 0x0c, 0x0e, 0x0d, 0x0e, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0e, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x00, 0x00, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x07, 0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x07, 0x07, 0x04, 0x06, 0x06, 0x04, 0x05, 0x07, 
+	0x07, 0x06, 0x05, 0x06, 0x07, 0x04, 0x06, 0x06, 
+	0x07, 0x07, 0x07, 0x04, 0x04, 0x01, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x01, 0x01, 0x06, 0x04, 0x06, 
+	0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x04, 0x04, 0x04, 0x06, 0x04, 0x04, 0x07, 
+	0x04, 0x07, 0x04, 0x06, 0x04, 0x04, 0x07, 0x06, 
+	0x04, 0x04, 0x04, 0x07, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 
 };
 
 static unsigned char m9b1[256] = {
@@ -7294,38 +7228,38 @@
 };
 
 static unsigned char m9b2[256] = {
-	0x08, 0x0c, 0x08, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0e, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 
-	0x0c, 0x0c, 0x0c, 0x02, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x08, 0x08, 0x08, 0x0c, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0e, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x09, 0x0c, 0x08, 0x08, 0x0c, 0x0e, 
-	0x08, 0x0d, 0x0e, 0x0c, 0x08, 0x0c, 0x00, 0x0c, 
-	0x08, 0x08, 0x0c, 0x0e, 0x0f, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x02, 
-	0x0e, 0x0a, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0f, 
-	0x08, 0x0e, 0x0c, 0x08, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x08, 0x08, 0x00, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x08, 0x0c, 0x08, 0x08, 0x0d, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x00, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x08, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x00, 
-	0x08, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x09, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0d, 0x08, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x08, 0x00, 0x08, 0x00, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x08, 0x08, 0x08, 0x00, 0x08, 
-	0x00, 0x00, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x08, 
-	0x0c, 0x00, 0x00, 0x08, 0x08, 0x00, 0x08, 0x0c, 
-	0x0c, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x08, 0x08, 
+	0x04, 0x06, 0x04, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x07, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 
+	0x06, 0x06, 0x06, 0x01, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x07, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 0x07, 
+	0x04, 0x06, 0x07, 0x06, 0x04, 0x06, 0x00, 0x06, 
+	0x04, 0x04, 0x06, 0x07, 0x07, 0x04, 0x06, 0x06, 
+	0x04, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x01, 
+	0x07, 0x05, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 
+	0x04, 0x07, 0x06, 0x04, 0x07, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x00, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x00, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x00, 
+	0x04, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x00, 0x04, 0x00, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 0x00, 0x04, 
+	0x00, 0x00, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x04, 
+	0x06, 0x00, 0x00, 0x04, 0x04, 0x00, 0x04, 0x06, 
+	0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 0x04, 0x04, 
 };
 
 static unsigned char m9c1[256] = {
@@ -7364,38 +7298,38 @@
 };
 
 static unsigned char m9c2[256] = {
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0d, 0x0c, 0x08, 
-	0x09, 0x08, 0x0d, 0x0c, 0x0c, 0x09, 0x08, 0x0c, 
-	0x00, 0x00, 0x00, 0x08, 0x0c, 0x0c, 0x08, 0x08, 
-	0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 
-	0x00, 0x0c, 0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x0c, 0x09, 
-	0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x00, 0x00, 0x00, 0x08, 0x0c, 0x0c, 0x08, 
-	0x00, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x02, 0x00, 0x00, 0x02, 
-	0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 
-	0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 
-	0x00, 0x00, 0x02, 0x00, 0x00, 0x0d, 0x0c, 0x0d, 
-	0x08, 0x0d, 0x0c, 0x08, 0x08, 0x0c, 0x08, 0x08, 
-	0x00, 0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0d, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x00, 0x00, 0x00, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x00, 0x00, 0x00, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x00, 0x00, 0x00, 0x04, 0x06, 0x06, 0x04, 
+	0x00, 0x06, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x01, 0x00, 0x00, 0x01, 
+	0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 
+	0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
+	0x00, 0x00, 0x01, 0x00, 0x00, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
 };
 
 static unsigned char m9d1[256] = {
@@ -7434,38 +7368,38 @@
 };
 
 static unsigned char m9d2[256] = {
-	0x0c, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 
-	0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x08, 
-	0x0d, 0x0c, 0x08, 0x00, 0x00, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x08, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x00, 0x08, 
-	0x00, 0x08, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 
-	0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x0c, 
-	0x0d, 0x0d, 0x08, 0x08, 0x08, 0x00, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x08, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 
-	0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0d, 0x0c, 0x00, 0x0c, 0x0c, 0x08, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x09, 0x0c, 0x00, 0x0c, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x08, 0x0d, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0d, 0x0d, 0x0d, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 
+	0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x00, 0x00, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 
+	0x06, 0x04, 0x04, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x00, 0x04, 
+	0x00, 0x04, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x00, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 
+	0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x00, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 
 };
 
 static unsigned char m9e1[256] = {
@@ -7504,38 +7438,38 @@
 };
 
 static unsigned char m9e2[256] = {
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 
-	0x08, 0x0c, 0x0d, 0x0c, 0x08, 0x0c, 0x0d, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 
-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 
-	0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, 
-	0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 
-	0x02, 0x02, 0x00, 0x02, 0x00, 0x0d, 0x08, 0x08, 
-	0x00, 0x0d, 0x0c, 0x08, 0x0c, 0x0d, 0x02, 0x0f, 
-	0x0c, 0x08, 0x0e, 0x0c, 0x08, 0x08, 0x0c, 0x0e, 
-	0x0e, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 
-	0x08, 0x0c, 0x0f, 0x0f, 0x0c, 0x08, 0x08, 0x0d, 
-	0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x08, 0x0f, 
-	0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x0d, 0x0a, 0x0c, 
-	0x08, 0x0c, 0x08, 0x08, 0x08, 0x0c, 0x0c, 0x08, 
-	0x0c, 0x08, 0x08, 0x08, 0x0f, 0x0d, 0x0c, 0x0c, 
-	0x02, 0x00, 0x00, 0x0f, 0x0c, 0x0a, 0x0f, 0x08, 
-	0x0c, 0x08, 0x0c, 0x0d, 0x0a, 0x08, 0x08, 0x08, 
-	0x0c, 0x02, 0x08, 0x08, 0x0c, 0x0f, 0x0f, 0x0e, 
-	0x0c, 0x0f, 0x08, 0x0c, 0x0f, 0x0c, 0x0c, 0x08, 
-	0x0f, 0x08, 0x0c, 0x0f, 0x0f, 0x0e, 0x0d, 0x0e, 
-	0x0e, 0x00, 0x0a, 0x08, 0x0c, 0x0e, 0x0c, 0x0e, 
-	0x0d, 0x02, 0x02, 0x0c, 0x08, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x08, 0x0c, 0x0c, 0x0d, 0x0c, 0x0c, 0x0c, 
-	0x08, 0x0e, 0x0c, 0x0e, 0x0e, 0x0c, 0x0a, 0x0c, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 0x04, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 
+	0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 
+	0x01, 0x01, 0x00, 0x01, 0x00, 0x06, 0x04, 0x04, 
+	0x00, 0x06, 0x06, 0x04, 0x06, 0x06, 0x01, 0x07, 
+	0x06, 0x04, 0x07, 0x06, 0x04, 0x04, 0x06, 0x07, 
+	0x07, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 
+	0x04, 0x06, 0x07, 0x07, 0x06, 0x04, 0x04, 0x06, 
+	0x04, 0x06, 0x06, 0x06, 0x06, 0x07, 0x04, 0x07, 
+	0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x05, 0x06, 
+	0x04, 0x06, 0x04, 0x04, 0x04, 0x06, 0x06, 0x04, 
+	0x06, 0x04, 0x04, 0x04, 0x07, 0x06, 0x06, 0x06, 
+	0x01, 0x00, 0x00, 0x07, 0x06, 0x05, 0x07, 0x04, 
+	0x06, 0x04, 0x06, 0x06, 0x05, 0x04, 0x04, 0x04, 
+	0x06, 0x01, 0x04, 0x04, 0x06, 0x07, 0x07, 0x07, 
+	0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x06, 0x04, 
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x07, 0x06, 0x07, 
+	0x07, 0x00, 0x05, 0x04, 0x06, 0x07, 0x06, 0x07, 
+	0x06, 0x01, 0x01, 0x06, 0x04, 0x06, 0x06, 0x07, 
+	0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x07, 0x06, 0x07, 0x07, 0x06, 0x05, 0x06, 
 };
 
 static unsigned char m9f1[256] = {
@@ -7574,27 +7508,27 @@
 };
 
 static unsigned char m9f2[256] = {
-	0x0c, 0x0c, 0x08, 0x08, 0x08, 0x08, 0x0c, 0x0d, 
-	0x09, 0x0c, 0x0c, 0x02, 0x00, 0x02, 0x0f, 0x0c, 
-	0x0e, 0x08, 0x0c, 0x0f, 0x08, 0x0c, 0x0c, 0x0a, 
-	0x0c, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x08, 
-	0x0f, 0x00, 0x0e, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 
-	0x0c, 0x0a, 0x08, 0x0f, 0x08, 0x0e, 0x0e, 0x08, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0a, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0d, 0x0d, 0x0c, 0x0c, 0x0d, 0x0c, 
-	0x0a, 0x02, 0x0d, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0d, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x08, 0x08, 0x0d, 0x0c, 0x0d, 0x08, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x08, 0x0c, 0x0c, 0x0c, 0x0d, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x08, 0x08, 0x0c, 0x02, 
-	0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x0d, 0x08, 0x08, 
-	0x0d, 0x0c, 0x0c, 0x08, 0x0c, 0x0d, 0x08, 0x08, 
-	0x0c, 0x0a, 0x02, 0x02, 0x0d, 0x08, 0x08, 0x02, 
-	0x0e, 0x08, 0x0c, 0x08, 0x0c, 0x08, 0x00, 0x00, 
+	0x06, 0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 0x06, 
+	0x04, 0x06, 0x06, 0x01, 0x00, 0x01, 0x07, 0x06, 
+	0x07, 0x04, 0x06, 0x07, 0x04, 0x06, 0x06, 0x05, 
+	0x06, 0x07, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 
+	0x07, 0x00, 0x07, 0x06, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x07, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 
+	0x06, 0x05, 0x04, 0x07, 0x04, 0x07, 0x07, 0x04, 
+	0x06, 0x06, 0x06, 0x06, 0x05, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x05, 0x01, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x04, 0x04, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x01, 
+	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 
+	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x04, 0x04, 
+	0x06, 0x05, 0x01, 0x01, 0x06, 0x04, 0x04, 0x01, 
+	0x07, 0x04, 0x06, 0x04, 0x06, 0x04, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -7641,41 +7575,6 @@
 	0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x80, 
 	0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x80, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char mac2[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char mad1[256] = {
@@ -7711,41 +7610,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 
-};
-
-static unsigned char mad2[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
 };
 
 static unsigned char mae1[256] = {
@@ -7783,41 +7647,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mae2[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char maf1[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 
@@ -7851,41 +7680,6 @@
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char maf2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
 static unsigned char mb01[256] = {
@@ -7923,41 +7717,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mb02[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mb11[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 
@@ -7991,41 +7750,6 @@
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char mb12[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char mb21[256] = {
@@ -8063,41 +7787,6 @@
 	0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 
 };
 
-static unsigned char mb22[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 
-};
-
 static unsigned char mb31[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8133,41 +7822,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mb32[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mb41[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8203,41 +7857,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mb42[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mb51[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8273,41 +7892,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mb52[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mb61[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8343,41 +7927,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mb62[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mb71[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8413,41 +7962,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 
 };
 
-static unsigned char mb72[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-};
-
 static unsigned char mb81[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
@@ -8481,41 +7995,6 @@
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char mb82[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char mb91[256] = {
@@ -8553,41 +8032,6 @@
 	0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mb92[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mba1[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8621,41 +8065,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mba2[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
 };
 
 static unsigned char mbb1[256] = {
@@ -8691,41 +8100,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 
-};
-
-static unsigned char mbb2[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
 };
 
 static unsigned char mbc1[256] = {
@@ -8763,41 +8137,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mbc2[256] = {
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mbd1[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8831,41 +8170,6 @@
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mbd2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
 static unsigned char mbe1[256] = {
@@ -8903,41 +8207,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mbe2[256] = {
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mbf1[256] = {
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8968,41 +8237,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mbf2[256] = {
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9043,41 +8277,6 @@
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mc02[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mc11[256] = {
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9113,41 +8312,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 
 };
 
-static unsigned char mc12[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-};
-
 static unsigned char mc21[256] = {
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 
@@ -9183,41 +8347,6 @@
 	0x80, 0x80, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mc22[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mc31[256] = {
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 
@@ -9253,41 +8382,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mc32[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mc41[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9321,41 +8415,6 @@
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 
-};
-
-static unsigned char mc42[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 
 };
 
 static unsigned char mc51[256] = {
@@ -9393,41 +8452,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 
 };
 
-static unsigned char mc52[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 
-};
-
 static unsigned char mc61[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
@@ -9461,41 +8485,6 @@
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char mc62[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char mc71[256] = {
@@ -9533,41 +8522,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mc72[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mc81[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9601,41 +8555,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char mc82[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char mc91[256] = {
@@ -9673,41 +8592,6 @@
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mc92[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mca1[256] = {
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 
@@ -9743,41 +8627,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mca2[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mcb1[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9809,41 +8658,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mcb2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
@@ -9883,41 +8697,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mcc2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mcd1[256] = {
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
@@ -9951,41 +8730,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char mcd2[256] = {
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char mce1[256] = {
@@ -10023,41 +8767,6 @@
 	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char mce2[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mcf1[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10091,41 +8800,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char mcf2[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
 };
 
 static unsigned char md01[256] = {
@@ -10163,41 +8837,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char md02[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char md11[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 
@@ -10231,41 +8870,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char md12[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
 static unsigned char md21[256] = {
@@ -10301,41 +8905,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char md22[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
 static unsigned char md31[256] = {
@@ -10373,41 +8942,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 
 };
 
-static unsigned char md32[256] = {
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-};
-
 static unsigned char md41[256] = {
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10441,41 +8975,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char md42[256] = {
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char md51[256] = {
@@ -10513,41 +9012,6 @@
 	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char md52[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char md61[256] = {
 	0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10581,41 +9045,6 @@
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 
-};
-
-static unsigned char md62[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
 };
 
 static unsigned char md71[256] = {
@@ -10653,41 +9082,6 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 
-static unsigned char md72[256] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
 static unsigned char mf62[256] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10711,64 +9105,64 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
 };
 
 static unsigned char mf72[256] = {
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
 };
 
 static unsigned char mf82[256] = {
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 
-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10828,41 +9222,6 @@
 	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
 };
 
-static unsigned char mf92[256] = {
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-};
-
 static unsigned char mfa1[256] = {
 	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
 	0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
@@ -10899,12 +9258,12 @@
 };
 
 static unsigned char mfa2[256] = {
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -10940,14 +9299,14 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0c, 0x0c, 0x08, 0x04, 0x04, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 
-	0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x04, 
-	0x0c, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 
-	0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 
+	0x06, 0x06, 0x04, 0x02, 0x02, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x02, 
+	0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 
+	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -11004,35 +9363,35 @@
 };
 
 static unsigned char mff2[256] = {
-	0x00, 0x0f, 0x03, 0x0f, 0x0f, 0x0f, 0x0f, 0x03, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x03, 0x0f, 0x03, 0x03, 0x0f, 
-	0x03, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0f, 0x0f, 0x01, 0x07, 0x00, 0x0f, 0x01, 0x00, 
+	0x00, 0x07, 0x01, 0x07, 0x07, 0x07, 0x07, 0x01, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x01, 0x07, 0x01, 0x01, 0x07, 
+	0x01, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x07, 0x07, 0x00, 0x03, 0x00, 0x07, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -11086,17 +9445,17 @@
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
-	{ NULL, mac1, mac2, }, { NULL, mad1, mad2, }, { NULL, mae1, mae2, }, { NULL, maf1, maf2, }, 
-	{ NULL, mb01, mb02, }, { NULL, mb11, mb12, }, { NULL, mb21, mb22, }, { NULL, mb31, mb32, }, 
-	{ NULL, mb41, mb42, }, { NULL, mb51, mb52, }, { NULL, mb61, mb62, }, { NULL, mb71, mb72, }, 
-	{ NULL, mb81, mb82, }, { NULL, mb91, mb92, }, { NULL, mba1, mba2, }, { NULL, mbb1, mbb2, }, 
-	{ NULL, mbc1, mbc2, }, { NULL, mbd1, mbd2, }, { NULL, mbe1, mbe2, }, { NULL, mbf1, mbf2, }, 
-	{ NULL, mc01, mc02, }, { NULL, mc11, mc12, }, { NULL, mc21, mc22, }, { NULL, mc31, mc32, }, 
-	{ NULL, mc41, mc42, }, { NULL, mc51, mc52, }, { NULL, mc61, mc62, }, { NULL, mc71, mc72, }, 
-	{ NULL, mc81, mc82, }, { NULL, mc91, mc92, }, { NULL, mca1, mca2, }, { NULL, mcb1, mcb2, }, 
-	{ NULL, mcc1, mcc2, }, { NULL, mcd1, mcd2, }, { NULL, mce1, mce2, }, { NULL, mcf1, mcf2, }, 
-	{ NULL, md01, md02, }, { NULL, md11, md12, }, { NULL, md21, md22, }, { NULL, md31, md32, }, 
-	{ NULL, md41, md42, }, { NULL, md51, md52, }, { NULL, md61, md62, }, { NULL, md71, md72, }, 
+	{ NULL, mac1, NULL, }, { NULL, mad1, NULL, }, { NULL, mae1, NULL, }, { NULL, maf1, NULL, }, 
+	{ NULL, mb01, NULL, }, { NULL, mb11, NULL, }, { NULL, mb21, NULL, }, { NULL, mb31, NULL, }, 
+	{ NULL, mb41, NULL, }, { NULL, mb51, NULL, }, { NULL, mb61, NULL, }, { NULL, mb71, NULL, }, 
+	{ NULL, mb81, NULL, }, { NULL, mb91, NULL, }, { NULL, mba1, NULL, }, { NULL, mbb1, NULL, }, 
+	{ NULL, mbc1, NULL, }, { NULL, mbd1, NULL, }, { NULL, mbe1, NULL, }, { NULL, mbf1, NULL, }, 
+	{ NULL, mc01, NULL, }, { NULL, mc11, NULL, }, { NULL, mc21, NULL, }, { NULL, mc31, NULL, }, 
+	{ NULL, mc41, NULL, }, { NULL, mc51, NULL, }, { NULL, mc61, NULL, }, { NULL, mc71, NULL, }, 
+	{ NULL, mc81, NULL, }, { NULL, mc91, NULL, }, { NULL, mca1, NULL, }, { NULL, mcb1, NULL, }, 
+	{ NULL, mcc1, NULL, }, { NULL, mcd1, NULL, }, { NULL, mce1, NULL, }, { NULL, mcf1, NULL, }, 
+	{ NULL, md01, NULL, }, { NULL, md11, NULL, }, { NULL, md21, NULL, }, { NULL, md31, NULL, }, 
+	{ NULL, md41, NULL, }, { NULL, md51, NULL, }, { NULL, md61, NULL, }, { NULL, md71, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
@@ -11105,7 +9464,7 @@
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, mf62, }, { NULL, NULL, mf72, }, 
-	{ NULL, NULL, mf82, }, { NULL, mf91, mf92, }, { NULL, mfa1, mfa2, }, { NULL, NULL, NULL, }, 
+	{ NULL, NULL, mf82, }, { NULL, mf91, NULL, }, { NULL, mfa1, mfa2, }, { NULL, NULL, NULL, }, 
 	{ NULL, NULL, NULL, }, { NULL, NULL, NULL, }, { NULL, NULL, mfe2, }, { NULL, mff1, mff2, }, 
 };
 
@@ -11129,10 +9488,9 @@
 	{ "Shift-JIS", 0x00002000 },
 	{ "euc-jp", 0x00004000 },
 	{ "euc-kr", 0x00008000 },
-	{ "iso-2022-kr", 0x00010000 },
-	{ "gb2312", 0x00020000 },
-	{ "Big5", 0x00040000 },
-	{ "euc-tw", 0x00080000 },
+	{ "gb2312", 0x00010000 },
+	{ "Big5", 0x00020000 },
+	{ "euc-tw", 0x00040000 },
 };
 
 #define charset_mask(x) \

Modified: packages/unstable/gmime2.4/gmime/gmime-charset.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-charset.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-charset.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-charset.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -72,9 +72,9 @@
 /* a useful website on charset alaises:
  * http://www.li18nux.org/subgroups/sa/locnameguide/v1.1draft/CodesetAliasTable-V11.html */
 
-struct {
-	char *charset;
-	char *iconv_name;
+static struct {
+	const char *charset;
+	const char *iconv_name;
 } known_iconv_charsets[] = {
 	/* charset name, iconv-friendly name (sometimes case sensitive) */
 	{ "utf-8",           "UTF-8"      },
@@ -139,8 +139,8 @@
  * g_mime_charset_iconv_name() so that we don't have to keep track of
  * all the aliases too. */
 static struct {
-	char *charset;
-	char *lang;
+	const char *charset;
+	const char *lang;
 } cjkr_lang_map[] = {
 	{ "Big5",        "zh" },
 	{ "BIG5HKSCS",   "zh" },

Modified: packages/unstable/gmime2.4/gmime/gmime-charset.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-charset.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-charset.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-charset.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-cipher-context.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-cipher-context.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-cipher-context.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-cipher-context.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -425,8 +425,8 @@
 	signer->status = GMIME_SIGNER_STATUS_NONE;
 	signer->errors = GMIME_SIGNER_ERROR_NONE;
 	signer->trust = GMIME_SIGNER_TRUST_NONE;
-	signer->created = (time_t) 0;
-	signer->expires = (time_t) 0;
+	signer->created = (time_t) -1;
+	signer->expires = (time_t) -1;
 	signer->fingerprint = NULL;
 	signer->keyid = NULL;
 	signer->name = NULL;
@@ -440,7 +440,8 @@
  * g_mime_signer_free:
  * @signer: signer
  *
- * Free's the singleton signer.
+ * Frees a singleton signer. Should NOT be used to free signers
+ * returned from g_mime_signature_validity_get_signers().
  **/
 void
 g_mime_signer_free (GMimeSigner *signer)
@@ -495,7 +496,7 @@
  * Returns: the signer status.
  **/
 GMimeSignerStatus
-g_mime_signer_get_status (GMimeSigner *signer)
+g_mime_signer_get_status (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, GMIME_SIGNER_STATUS_NONE);
 	
@@ -528,7 +529,7 @@
  * Returns: the signer errors.
  **/
 GMimeSignerError
-g_mime_signer_get_errors (GMimeSigner *signer)
+g_mime_signer_get_errors (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, GMIME_SIGNER_ERROR_NONE);
 	
@@ -561,7 +562,7 @@
  * Returns: the signer trust.
  **/
 GMimeSignerTrust
-g_mime_signer_get_trust (GMimeSigner *signer)
+g_mime_signer_get_trust (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, GMIME_SIGNER_TRUST_NONE);
 	
@@ -595,7 +596,7 @@
  * Returns: the signer's key fingerprint.
  **/
 const char *
-g_mime_signer_get_fingerprint (GMimeSigner *signer)
+g_mime_signer_get_fingerprint (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, NULL);
 	
@@ -629,7 +630,7 @@
  * Returns: the signer's key id.
  **/
 const char *
-g_mime_signer_get_key_id (GMimeSigner *signer)
+g_mime_signer_get_key_id (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, NULL);
 	
@@ -663,7 +664,7 @@
  * Returns: the signer's name.
  **/
 const char *
-g_mime_signer_get_name (GMimeSigner *signer)
+g_mime_signer_get_name (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, NULL);
 	
@@ -693,10 +694,10 @@
  *
  * Get the creation date of the signer's key.
  *
- * Returns: the creation date of the signer's key.
+ * Returns: the creation date of the signer's key or %-1 if unknown.
  **/
 time_t
-g_mime_signer_get_created (GMimeSigner *signer)
+g_mime_signer_get_created (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, (time_t) -1);
 	
@@ -726,10 +727,10 @@
  *
  * Get the expiration date of the signer's key.
  *
- * Returns: the expiration date of the signer's key.
+ * Returns: the expiration date of the signer's key or %-1 if unknown.
  **/
 time_t
-g_mime_signer_get_expires (GMimeSigner *signer)
+g_mime_signer_get_expires (const GMimeSigner *signer)
 {
 	g_return_val_if_fail (signer != NULL, (time_t) -1);
 	
@@ -860,7 +861,8 @@
  * Gets the list of signers.
  *
  * Returns: a #GMimeSigner list which contain further information such
- * as trust and cipher keys.
+ * as trust and cipher keys. These signers are part of the
+ * #GMimeSignatureValidity and should NOT be freed individually.
  **/
 const GMimeSigner *
 g_mime_signature_validity_get_signers (const GMimeSignatureValidity *validity)
@@ -876,7 +878,8 @@
  * @validity: signature validity
  * @signer: signer
  *
- * Adds @signer to the list of signers on @validity.
+ * Adds @signer to the list of signers on @validity. Once the signer
+ * is added, it must NOT be freed.
  **/
 void
 g_mime_signature_validity_add_signer  (GMimeSignatureValidity *validity, GMimeSigner *signer)

Modified: packages/unstable/gmime2.4/gmime/gmime-cipher-context.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-cipher-context.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-cipher-context.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-cipher-context.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -256,28 +256,28 @@
 GMimeSigner *g_mime_signer_next (GMimeSigner *signer);
 
 void g_mime_signer_set_status (GMimeSigner *signer, GMimeSignerStatus status);
-GMimeSignerStatus g_mime_signer_get_status (GMimeSigner *signer);
+GMimeSignerStatus g_mime_signer_get_status (const GMimeSigner *signer);
 
 void g_mime_signer_set_errors (GMimeSigner *signer, GMimeSignerError error);
-GMimeSignerError g_mime_signer_get_errors (GMimeSigner *signer);
+GMimeSignerError g_mime_signer_get_errors (const GMimeSigner *signer);
 
 void g_mime_signer_set_trust (GMimeSigner *signer, GMimeSignerTrust trust);
-GMimeSignerTrust g_mime_signer_get_trust (GMimeSigner *signer);
+GMimeSignerTrust g_mime_signer_get_trust (const GMimeSigner *signer);
 
 void g_mime_signer_set_fingerprint (GMimeSigner *signer, const char *fingerprint);
-const char *g_mime_signer_get_fingerprint (GMimeSigner *signer);
+const char *g_mime_signer_get_fingerprint (const GMimeSigner *signer);
 
 void g_mime_signer_set_key_id (GMimeSigner *signer, const char *key_id);
-const char *g_mime_signer_get_key_id (GMimeSigner *signer);
+const char *g_mime_signer_get_key_id (const GMimeSigner *signer);
 
 void g_mime_signer_set_name (GMimeSigner *signer, const char *name);
-const char *g_mime_signer_get_name (GMimeSigner *signer);
+const char *g_mime_signer_get_name (const GMimeSigner *signer);
 
 void g_mime_signer_set_created (GMimeSigner *signer, time_t created);
-time_t g_mime_signer_get_created (GMimeSigner *signer);
+time_t g_mime_signer_get_created (const GMimeSigner *signer);
 
 void g_mime_signer_set_expires (GMimeSigner *signer, time_t expires);
-time_t g_mime_signer_get_expires (GMimeSigner *signer);
+time_t g_mime_signer_get_expires (const GMimeSigner *signer);
 
 
 

Modified: packages/unstable/gmime2.4/gmime/gmime-common.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-common.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-common.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-common.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-common.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-common.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-common.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-common.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-content-type.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-content-type.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-content-type.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-content-type.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-content-type.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-content-type.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-content-type.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-content-type.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-data-wrapper.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-data-wrapper.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-data-wrapper.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-data-wrapper.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -184,8 +184,7 @@
  *
  * Gets a reference to the stream wrapped by @wrapper.
  *
- * Returns: a reference to the internal stream. Caller is responsible
- * for unrefing it.
+ * Returns: a reference to the internal stream.
  **/
 GMimeStream *
 g_mime_data_wrapper_get_stream (GMimeDataWrapper *wrapper)

Modified: packages/unstable/gmime2.4/gmime/gmime-data-wrapper.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-data-wrapper.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-data-wrapper.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-data-wrapper.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-disposition.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-disposition.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-disposition.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-disposition.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-disposition.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-disposition.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-disposition.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-disposition.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-encodings.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-encodings.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-encodings.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-encodings.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast and Michael Zucchi
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast and Michael Zucchi
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -506,45 +506,60 @@
 	const unsigned char *inend;
 	register guint32 saved;
 	unsigned char c;
-	int i;
+	int npad, n, i;
 	
 	inend = inbuf + inlen;
 	outptr = outbuf;
+	inptr = inbuf;
+	
+	npad = (*state >> 8) & 0xff;
+	n = *state & 0xff;
+	saved = *save;
 	
 	/* convert 4 base64 bytes to 3 normal bytes */
-	saved = *save;
-	i = *state;
-	inptr = inbuf;
 	while (inptr < inend) {
 		c = gmime_base64_rank[*inptr++];
 		if (c != 0xff) {
 			saved = (saved << 6) | c;
-			i++;
-			if (i == 4) {
+			n++;
+			if (n == 4) {
 				*outptr++ = saved >> 16;
 				*outptr++ = saved >> 8;
 				*outptr++ = saved;
-				i = 0;
-			}
-		}
-	}
-	
-	*save = saved;
-	*state = i;
-	
-	/* quick scan back for '=' on the end somewhere */
-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */
-	i = 2;
-	while (inptr > inbuf && i) {
+				n = 0;
+				
+				if (npad > 0) {
+					outptr -= npad;
+					npad = 0;
+				}
+			}
+		}
+	}
+	
+	/* quickly scan back for '=' on the end somewhere */
+	/* fortunately we can drop 1 output char for each trailing '=' (up to 2) */
+	for (i = 2; inptr > inbuf && i; ) {
 		inptr--;
 		if (gmime_base64_rank[*inptr] != 0xff) {
-			if (*inptr == '=' && outptr > outbuf)
-				outptr--;
+			if (*inptr == '=' && outptr > outbuf) {
+				if (n == 0) {
+					/* we've got a complete quartet so it's
+					   safe to drop an output character. */
+					outptr--;
+				} else if (npad < 2) {
+					/* keep a record of the number of ='s at
+					   the end of the input stream, up to 2 */
+					npad++;
+				}
+			}
+			
 			i--;
 		}
 	}
 	
-	/* if i != 0 then there is a truncation error! */
+	*state = (npad << 8) | n;
+	*save = saved;
+	
 	return (outptr - outbuf);
 }
 
@@ -887,7 +902,12 @@
 		}
 	}
 	
-	*outptr++ = '\n';
+	if (last != '\n') {
+		/* we end with =\n so that the \n isn't interpreted as a real
+		   \n when it gets decoded later */
+		*outptr++ = '=';
+		*outptr++ = '\n';
+	}
 	
 	*save = 0;
 	*state = -1;

Modified: packages/unstable/gmime2.4/gmime/gmime-encodings.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-encodings.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-encodings.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-encodings.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -78,7 +78,7 @@
  * Returns: the number of output bytes needed to encode an input buffer
  * of size @x using the quoted-printable encoding.
  **/
-#define GMIME_QP_ENCODE_LEN(x)     ((size_t) ((((x) + 1) * 3) + 1))
+#define GMIME_QP_ENCODE_LEN(x)     ((size_t) ((((x) / 24) * 74) + 74))
 
 
 /**
@@ -91,7 +91,7 @@
  * Returns: the number of output bytes needed to uuencode an input
  * buffer of size @x.
  **/
-#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 62))
+#define GMIME_UUENCODE_LEN(x)      ((size_t) (((((x) + 2) / 45) * 62) + 64))
 
 
 /**

Modified: packages/unstable/gmime2.4/gmime/gmime-error.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-error.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-error.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-error.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-basic.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-basic.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-basic.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-basic.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-basic.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-basic.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-basic.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-basic.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-best.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-best.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-best.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-best.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-best.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-best.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-best.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-best.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-charset.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-charset.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-charset.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-charset.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-charset.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-charset.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-charset.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-charset.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-crlf.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-crlf.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-crlf.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-crlf.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-crlf.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-crlf.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-crlf.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-crlf.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-enriched.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-enriched.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-enriched.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-enriched.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-enriched.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-enriched.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-enriched.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-enriched.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-from.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-from.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-from.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-from.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-from.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-from.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-from.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-from.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-gzip.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-gzip.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-gzip.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-gzip.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-gzip.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-gzip.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-gzip.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-gzip.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-html.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-html.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-html.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-html.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-html.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-html.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-html.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-html.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-md5.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-md5.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-md5.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-md5.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-md5.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-md5.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-md5.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-md5.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-strip.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-strip.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-strip.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-strip.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-strip.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-strip.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-strip.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-strip.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-windows.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-windows.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-windows.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-windows.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-windows.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-windows.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-windows.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-windows.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-yenc.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-yenc.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-yenc.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-yenc.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-yenc.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-yenc.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-yenc.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-yenc.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-filter.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-gpg-context.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-gpg-context.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-gpg-context.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-gpg-context.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -101,6 +101,15 @@
 
 
 static GMimeCipherContextClass *parent_class = NULL;
+
+
+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 18
+static void
+g_set_error_literal (GError **err, GQuark domain, gint code, const gchar *message)
+{
+	g_set_error (err, domain, code, "%s", message);
+}
+#endif
 
 
 GType
@@ -252,7 +261,6 @@
 	
 	char *path;
 	char *userid;
-	char *sigfile;
 	GPtrArray *recipients;
 	GMimeCipherHash hash;
 	
@@ -260,7 +268,7 @@
 	int stdout_fd;
 	int stderr_fd;
 	int status_fd;
-	int passwd_fd;  /* only needed for sign/decrypt */
+	int secret_fd;  /* used for sign/decrypt/verify */
 	
 	/* status-fd buffer */
 	char *statusbuf;
@@ -270,6 +278,7 @@
 	char *need_id;
 	char *passwd;
 	
+	GMimeStream *sigstream;
 	GMimeStream *istream;
 	GMimeStream *ostream;
 	
@@ -326,7 +335,6 @@
 	
 	gpg->path = g_strdup (path);
 	gpg->userid = NULL;
-	gpg->sigfile = NULL;
 	gpg->recipients = NULL;
 	gpg->hash = GMIME_CIPHER_HASH_DEFAULT;
 	gpg->always_trust = FALSE;
@@ -336,7 +344,7 @@
 	gpg->stdout_fd = -1;
 	gpg->stderr_fd = -1;
 	gpg->status_fd = -1;
-	gpg->passwd_fd = -1;
+	gpg->secret_fd = -1;
 	
 	gpg->statusbuf = g_malloc (128);
 	gpg->statusptr = gpg->statusbuf;
@@ -358,6 +366,7 @@
 	gpg->signers = NULL;
 	gpg->signer = (GMimeSigner *) &gpg->signers;
 	
+	gpg->sigstream = NULL;
 	gpg->istream = NULL;
 	gpg->ostream = NULL;
 	
@@ -428,13 +437,6 @@
 }
 
 static void
-gpg_ctx_set_sigfile (struct _GpgCtx *gpg, const char *sigfile)
-{
-	g_free (gpg->sigfile);
-	gpg->sigfile = g_strdup (sigfile);
-}
-
-static void
 gpg_ctx_set_armor (struct _GpgCtx *gpg, gboolean armor)
 {
 	gpg->armor = armor;
@@ -459,6 +461,15 @@
 	gpg->seen_eof1 = FALSE;
 }
 
+static void
+gpg_ctx_set_sigstream (struct _GpgCtx *gpg, GMimeStream *sigstream)
+{
+	g_object_ref (sigstream);
+	if (gpg->sigstream)
+		g_object_unref (gpg->sigstream);
+	gpg->sigstream = sigstream;
+}
+
 static const char *
 gpg_ctx_get_diagnostics (struct _GpgCtx *gpg)
 {
@@ -485,8 +496,6 @@
 	g_free (gpg->path);
 	
 	g_free (gpg->userid);
-	
-	g_free (gpg->sigfile);
 	
 	if (gpg->recipients) {
 		for (i = 0; i < gpg->recipients->len; i++)
@@ -503,8 +512,8 @@
 		close (gpg->stderr_fd);
 	if (gpg->status_fd != -1)
 		close (gpg->status_fd);
-	if (gpg->passwd_fd != -1)
-		close (gpg->passwd_fd);
+	if (gpg->secret_fd != -1)
+		close (gpg->secret_fd);
 	
 	g_free (gpg->statusbuf);
 	
@@ -514,6 +523,9 @@
 		memset (gpg->passwd, 0, strlen (gpg->passwd));
 		g_free (gpg->passwd);
 	}
+	
+	if (gpg->sigstream)
+		g_object_unref (gpg->sigstream);
 	
 	if (gpg->istream)
 		g_object_unref (gpg->istream);
@@ -560,118 +572,134 @@
 	}
 }
 
-static GPtrArray *
-gpg_ctx_get_argv (struct _GpgCtx *gpg, int status_fd, char **sfd, int passwd_fd, char **pfd)
+static char **
+gpg_ctx_get_argv (struct _GpgCtx *gpg, int status_fd, int secret_fd, char ***strv)
 {
 	const char *hash_str;
-	GPtrArray *argv;
-	char *buf;
+	char **argv, *buf;
+	GPtrArray *args;
+	int v = 0;
 	guint i;
 	
-	argv = g_ptr_array_new ();
-	g_ptr_array_add (argv, "gpg");
-	
-	g_ptr_array_add (argv, "--verbose");
-	g_ptr_array_add (argv, "--no-secmem-warning");
-	g_ptr_array_add (argv, "--no-greeting");
-	g_ptr_array_add (argv, "--no-tty");
-	if (passwd_fd == -1) {
+	*strv = g_new (char *, 3);
+	
+	args = g_ptr_array_new ();
+	g_ptr_array_add (args, "gpg");
+	
+	g_ptr_array_add (args, "--verbose");
+	g_ptr_array_add (args, "--no-secmem-warning");
+	g_ptr_array_add (args, "--no-greeting");
+	g_ptr_array_add (args, "--no-tty");
+	
+	if (!gpg->need_passwd) {
 		/* only use batch mode if we don't intend on using the
-                   interactive --command-fd option */
-		g_ptr_array_add (argv, "--batch");
-		g_ptr_array_add (argv, "--yes");
-	}
-	
-	g_ptr_array_add (argv, "--charset=UTF-8");
-	
-	*sfd = buf = g_strdup_printf ("--status-fd=%d", status_fd);
-	g_ptr_array_add (argv, buf);
-	
-	if (passwd_fd != -1) {
-		*pfd = buf = g_strdup_printf ("--command-fd=%d", passwd_fd);
-		g_ptr_array_add (argv, buf);
+                   interactive --command-fd option to send it the
+                   user's password */
+		g_ptr_array_add (args, "--batch");
+		g_ptr_array_add (args, "--yes");
+	}
+	
+	g_ptr_array_add (args, "--charset=UTF-8");
+	
+	(*strv)[v++] = buf = g_strdup_printf ("--status-fd=%d", status_fd);
+	g_ptr_array_add (args, buf);
+	
+	if (gpg->need_passwd) {
+		(*strv)[v++] = buf = g_strdup_printf ("--command-fd=%d", secret_fd);
+		g_ptr_array_add (args, buf);
 	}
 	
 	switch (gpg->mode) {
 	case GPG_CTX_MODE_SIGN:
-		g_ptr_array_add (argv, "--sign");
-		g_ptr_array_add (argv, "--detach");
+		g_ptr_array_add (args, "--sign");
+		g_ptr_array_add (args, "--detach");
 		if (gpg->armor)
-			g_ptr_array_add (argv, "--armor");
+			g_ptr_array_add (args, "--armor");
 		hash_str = gpg_hash_str (gpg->hash);
 		if (hash_str)
-			g_ptr_array_add (argv, (char *) hash_str);
+			g_ptr_array_add (args, (char *) hash_str);
 		if (gpg->userid) {
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (char *) gpg->userid);
-		}
-		g_ptr_array_add (argv, "--output");
-		g_ptr_array_add (argv, "-");
+			g_ptr_array_add (args, "-u");
+			g_ptr_array_add (args, (char *) gpg->userid);
+		}
+		g_ptr_array_add (args, "--output");
+		g_ptr_array_add (args, "-");
 		break;
 	case GPG_CTX_MODE_VERIFY:
 		if (!g_mime_session_is_online (gpg->session)) {
 			/* this is a deprecated flag to gpg since 1.0.7 */
-			/*g_ptr_array_add (argv, "--no-auto-key-retrieve");*/
-			g_ptr_array_add (argv, "--keyserver-options");
-			g_ptr_array_add (argv, "no-auto-key-retrieve");
-		}
-		g_ptr_array_add (argv, "--verify");
-		if (gpg->sigfile)
-			g_ptr_array_add (argv, gpg->sigfile);
-		g_ptr_array_add (argv, "-");
+			/*g_ptr_array_add (args, "--no-auto-key-retrieve");*/
+			g_ptr_array_add (args, "--keyserver-options");
+			g_ptr_array_add (args, "no-auto-key-retrieve");
+		}
+		
+		g_ptr_array_add (args, "--enable-special-filenames");
+		g_ptr_array_add (args, "--verify");
+		g_ptr_array_add (args, "--");
+		
+		/* signature stream must come first */
+		(*strv)[v++] = buf = g_strdup_printf ("-&%d", secret_fd);
+		g_ptr_array_add (args, buf);
+		
+		/* followed by the content stream (in this case, stdin) */
+		g_ptr_array_add (args, "-");
 		break;
 	case GPG_CTX_MODE_SIGN_ENCRYPT:
-		g_ptr_array_add (argv,  "--sign");
+		g_ptr_array_add (args, "--sign");
 		
 		/* fall thru... */
 	case GPG_CTX_MODE_ENCRYPT:
-		g_ptr_array_add (argv,  "--encrypt");
+		g_ptr_array_add (args, "--encrypt");
 		
 		if (gpg->armor)
-			g_ptr_array_add (argv, "--armor");
+			g_ptr_array_add (args, "--armor");
 		
 		if (gpg->always_trust)
-			g_ptr_array_add (argv, "--always-trust");
+			g_ptr_array_add (args, "--always-trust");
 		
 		if (gpg->userid) {
-			g_ptr_array_add (argv, "-u");
-			g_ptr_array_add (argv, (char *) gpg->userid);
+			g_ptr_array_add (args, "-u");
+			g_ptr_array_add (args, (char *) gpg->userid);
 		}
 		
 		if (gpg->recipients) {
 			for (i = 0; i < gpg->recipients->len; i++) {
-				g_ptr_array_add (argv, "-r");
-				g_ptr_array_add (argv, gpg->recipients->pdata[i]);
+				g_ptr_array_add (args, "-r");
+				g_ptr_array_add (args, gpg->recipients->pdata[i]);
 			}
 		}
-		g_ptr_array_add (argv, "--output");
-		g_ptr_array_add (argv, "-");
+		g_ptr_array_add (args, "--output");
+		g_ptr_array_add (args, "-");
 		break;
 	case GPG_CTX_MODE_DECRYPT:
-		g_ptr_array_add (argv, "--decrypt");
-		g_ptr_array_add (argv, "--output");
-		g_ptr_array_add (argv, "-");
+		g_ptr_array_add (args, "--decrypt");
+		g_ptr_array_add (args, "--output");
+		g_ptr_array_add (args, "-");
 		break;
 	case GPG_CTX_MODE_IMPORT:
-		g_ptr_array_add (argv, "--import");
-		g_ptr_array_add (argv, "-");
+		g_ptr_array_add (args, "--import");
+		g_ptr_array_add (args, "-");
 		break;
 	case GPG_CTX_MODE_EXPORT:
 		if (gpg->armor)
-			g_ptr_array_add (argv, "--armor");
-		g_ptr_array_add (argv, "--export");
+			g_ptr_array_add (args, "--armor");
+		g_ptr_array_add (args, "--export");
 		for (i = 0; i < gpg->recipients->len; i++)
-			g_ptr_array_add (argv, gpg->recipients->pdata[i]);
+			g_ptr_array_add (args, gpg->recipients->pdata[i]);
 		break;
 	}
 	
 #if d(!)0
-	for (i = 0; i < argv->len; i++)
-		printf ("%s ", (char *) argv->pdata[i]);
+	for (i = 0; i < args->len; i++)
+		printf ("%s ", (char *) args->pdata[i]);
 	printf ("\n");
 #endif
 	
-	g_ptr_array_add (argv, NULL);
+	g_ptr_array_add (args, NULL);
+	(*strv)[v] = NULL;
+	
+	argv = (char **) args->pdata;
+	g_ptr_array_free (args, FALSE);
 	
 	return argv;
 }
@@ -679,28 +707,27 @@
 static int
 gpg_ctx_op_start (struct _GpgCtx *gpg)
 {
-	char *status_fd = NULL, *passwd_fd = NULL;
 	int i, maxfd, errnosave, fds[10];
-	GPtrArray *argv;
+	char **argv, **strv = NULL;
 	int flags;
 	
 	for (i = 0; i < 10; i++)
 		fds[i] = -1;
 	
-	maxfd = gpg->need_passwd ? 10 : 8;
+	maxfd = (gpg->need_passwd || gpg->sigstream) ? 10 : 8;
 	for (i = 0; i < maxfd; i += 2) {
 		if (pipe (fds + i) == -1)
 			goto exception;
 	}
 	
-	argv = gpg_ctx_get_argv (gpg, fds[7], &status_fd, fds[8], &passwd_fd);
+	argv = gpg_ctx_get_argv (gpg, fds[7], fds[8], &strv);
 	
 	if (!(gpg->pid = fork ())) {
 		/* child process */
 		
-		if ((dup2 (fds[0], STDIN_FILENO) < 0 ) ||
-		    (dup2 (fds[3], STDOUT_FILENO) < 0 ) ||
-		    (dup2 (fds[5], STDERR_FILENO) < 0 )) {
+		if ((dup2 (fds[0], STDIN_FILENO) < 0) ||
+		    (dup2 (fds[3], STDOUT_FILENO) < 0) ||
+		    (dup2 (fds[5], STDERR_FILENO) < 0)) {
 			_exit (255);
 		}
 		
@@ -717,20 +744,19 @@
 		}
 		
 		/* run gpg */
-		execvp (gpg->path, (char **) argv->pdata);
+		execvp (gpg->path, argv);
 		_exit (255);
 	} else if (gpg->pid < 0) {
-		g_ptr_array_free (argv, TRUE);
-		g_free (status_fd);
-		g_free (passwd_fd);
+		g_strfreev (strv);
+		g_free (argv);
 		goto exception;
 	}
 	
-	g_ptr_array_free (argv, TRUE);
-	g_free (status_fd);
-	g_free (passwd_fd);
-	
-	/* Parent */
+	/* parent process */
+	
+	g_strfreev (strv);
+	g_free (argv);
+	
 	close (fds[0]);
 	gpg->stdin_fd = fds[1];
 	gpg->stdout_fd = fds[2];
@@ -739,11 +765,12 @@
 	close (fds[5]);
 	gpg->status_fd = fds[6];
 	close (fds[7]);
-	if (gpg->need_passwd) {
+	
+	if (fds[8] != -1) {
+		flags = (flags = fcntl (fds[9], F_GETFL)) == -1 ? O_WRONLY : flags;
+		fcntl (fds[9], F_SETFL, flags | O_NONBLOCK);
+		gpg->secret_fd = fds[9];
 		close (fds[8]);
-		gpg->passwd_fd = fds[9];
-		flags = (flags = fcntl (gpg->passwd_fd, F_GETFL)) == -1 ? O_WRONLY : flags;
-		fcntl (gpg->passwd_fd, F_SETFL, flags | O_NONBLOCK);
 	}
 	
 	flags = (flags = fcntl (gpg->stdin_fd, F_GETFL)) == -1 ? O_WRONLY : flags;
@@ -764,7 +791,7 @@
 	
 	errnosave = errno;
 	
-	for (i = 0; i < 10; i++) {
+	for (i = 0; i < maxfd; i++) {
 		if (fds[i] != -1)
 			close (fds[i]);
 	}
@@ -798,6 +825,34 @@
 	return inptr;
 }
 
+/**
+ * gpg_ctx_add_signer:
+ * @gpg: GnuPG context
+ * @info: a string with the signer's info
+ *
+ * Parses GOODSIG, BADSIG, EXPSIG, EXPKEYSIG, and REVKEYSIG status messages
+ * into a newly allocated #GMimeSigner, adding it to @gpg's signer list.
+ *
+ * Returns: the newly added signer for the caller to add more info to.
+ **/
+static GMimeSigner *
+gpg_ctx_add_signer (struct _GpgCtx *gpg, char *info)
+{
+	GMimeSigner *signer;
+	
+	signer = g_mime_signer_new ();
+	gpg->signer->next = signer;
+	gpg->signer = signer;
+	
+	/* get the key id of the signer */
+	info = next_token (info, &signer->keyid);
+	
+	/* the rest of the string is the signer's name */
+	signer->name = g_strdup (info);
+	
+	return signer;
+}
+
 static void
 gpg_ctx_parse_signer_info (struct _GpgCtx *gpg, char *status)
 {
@@ -806,33 +861,20 @@
 	if (!strncmp (status, "SIG_ID ", 7)) {
 		/* not sure if this contains anything we care about... */
 	} else if (!strncmp (status, "GOODSIG ", 8)) {
+		signer = gpg_ctx_add_signer (gpg, status + 8);
 		gpg->goodsig = TRUE;
-		status += 8;
-		
-		signer = g_mime_signer_new ();
-		signer->status = GMIME_SIGNER_STATUS_GOOD;
-		gpg->signer->next = signer;
-		gpg->signer = signer;
-		
-		/* get the key id of the signer */
-		status = next_token (status, &signer->keyid);
-		
-		/* the rest of the string is the signer's name */
-		signer->name = g_strdup (status);
 	} else if (!strncmp (status, "BADSIG ", 7)) {
+		signer = gpg_ctx_add_signer (gpg, status + 7);
 		gpg->badsig = TRUE;
-		status += 7;
-		
-		signer = g_mime_signer_new ();
-		signer->status = GMIME_SIGNER_STATUS_BAD;
-		gpg->signer->next = signer;
-		gpg->signer = signer;
-		
-		/* get the key id of the signer */
-		status = next_token (status, &signer->keyid);
-		
-		/* the rest of the string is the signer's name */
-		signer->name = g_strdup (status);
+	} else if (!strncmp (status, "EXPSIG ", 7)) {
+		signer = gpg_ctx_add_signer (gpg, status + 7);
+		signer->errors |= GMIME_SIGNER_ERROR_EXPSIG;
+	} else if (!strncmp (status, "EXPKEYSIG ", 10)) {
+		signer = gpg_ctx_add_signer (gpg, status + 10);
+		signer->errors |= GMIME_SIGNER_ERROR_EXPKEYSIG;
+	} else if (!strncmp (status, "REVKEYSIG ", 10)) {
+		signer = gpg_ctx_add_signer (gpg, status + 10);
+		signer->errors |= GMIME_SIGNER_ERROR_REVKEYSIG;
 	} else if (!strncmp (status, "ERRSIG ", 7)) {
 		/* Note: NO_PUBKEY often comes after an ERRSIG */
 		gpg->errsig = TRUE;
@@ -864,13 +906,6 @@
 		/* the only token is the keyid, but we've already got it */
 		gpg->signer->errors |= GMIME_SIGNER_ERROR_NO_PUBKEY;
 		gpg->nopubkey = TRUE;
-	} else if (!strncmp (status, "EXPSIG", 6)) {
-		/* FIXME: see what else we can glean from this... */
-		gpg->signer->errors |= GMIME_SIGNER_ERROR_EXPSIG;
-	} else if (!strncmp (status, "EXPKEYSIG", 9)) {
-		gpg->signer->errors |= GMIME_SIGNER_ERROR_EXPKEYSIG;
-	} else if (!strncmp (status, "REVKEYSIG", 9)) {
-		gpg->signer->errors |= GMIME_SIGNER_ERROR_REVKEYSIG;
 	} else if (!strncmp (status, "VALIDSIG ", 9)) {
 		char *inend;
 		
@@ -966,8 +1001,8 @@
 		
 		status = next_token (status, &hint);
 		if (!hint) {
-			g_set_error (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
-				     _("Failed to parse gpg userid hint."));
+			g_set_error_literal (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
+					     _("Failed to parse gpg userid hint."));
 			return -1;
 		}
 		
@@ -990,8 +1025,8 @@
 		
 		status = next_token (status, &userid);
 		if (!userid) {
-			g_set_error (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
-				     _("Failed to parse gpg passphrase request."));
+			g_set_error_literal (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
+					     _("Failed to parse gpg passphrase request."));
 			return -1;
 		}
 		
@@ -1004,8 +1039,8 @@
 		
 		status = next_token (status, &userid);
 		if (!userid) {
-			g_set_error (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
-				     _("Failed to parse gpg passphrase request."));
+			g_set_error_literal (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
+					     _("Failed to parse gpg passphrase request."));
 			return -1;
 		}
 		
@@ -1055,7 +1090,7 @@
 			gpg->send_passwd = TRUE;
 		} else {
 			if (err && *err == NULL)
-				g_set_error (err, GMIME_ERROR, ECANCELED, _("Canceled."));
+				g_set_error_literal (err, GMIME_ERROR, ECANCELED, _("Canceled."));
 			
 			g_free (prompt);
 			
@@ -1069,8 +1104,8 @@
 		g_mime_session_forget_passwd (gpg->session, gpg->userid, NULL);
 		
 		if (gpg->bad_passwds == 3) {
-			g_set_error (err, GMIME_ERROR, GMIME_ERROR_BAD_PASSWORD,
-				     _("Failed to unlock secret key: 3 bad passphrases given."));
+			g_set_error_literal (err, GMIME_ERROR, GMIME_ERROR_BAD_PASSWORD,
+					     _("Failed to unlock secret key: 3 bad passphrases given."));
 			return -1;
 		}
 	} else if (!strncmp (status, "UNEXPECTED ", 11)) {
@@ -1094,11 +1129,9 @@
 		
 		diagnostics = gpg_ctx_get_diagnostics (gpg);
 		if (diagnostics && *diagnostics)
-			g_set_error (err, GMIME_ERROR, GMIME_ERROR_GENERAL,
-				     "%s", diagnostics);
+			g_set_error_literal (err, GMIME_ERROR, GMIME_ERROR_GENERAL, diagnostics);
 		else
-			g_set_error (err, GMIME_ERROR, GMIME_ERROR_GENERAL,
-				     _("No data provided"));
+			g_set_error_literal (err, GMIME_ERROR, GMIME_ERROR_GENERAL, _("No data provided"));
 		
 		gpg->nodata = TRUE;
 		
@@ -1142,8 +1175,8 @@
 			} else if (!strncmp (status, "END_ENCRYPTION", 14)) {
 				/* nothing to do, but we know the end is near? */
 			} else if (!strncmp (status, "NO_RECP", 7)) {
-				g_set_error (err, GMIME_ERROR, GMIME_ERROR_NO_VALID_RECIPIENTS,
-					     _("Failed to encrypt: No valid recipients specified."));
+				g_set_error_literal (err, GMIME_ERROR, GMIME_ERROR_NO_VALID_RECIPIENTS,
+						     _("Failed to encrypt: No valid recipients specified."));
 				return -1;
 			}
 			break;
@@ -1241,7 +1274,7 @@
 	GPG_STDOUT_FD,
 	GPG_STDERR_FD,
 	GPG_STATUS_FD,
-	GPG_PASSWD_FD,
+	GPG_SECRET_FD,
 	GPG_N_FDS
 };
 
@@ -1353,8 +1386,8 @@
 	pfds[GPG_STDIN_FD].fd = gpg->stdin_fd;
 	pfds[GPG_STDIN_FD].events = POLLOUT;
 	
-	pfds[GPG_PASSWD_FD].fd = gpg->passwd_fd;
-	pfds[GPG_PASSWD_FD].events = POLLOUT;
+	pfds[GPG_SECRET_FD].fd = gpg->secret_fd;
+	pfds[GPG_SECRET_FD].events = POLLOUT;
 	
 	do {
 		for (n = 0; n < GPG_N_FDS; n++)
@@ -1408,6 +1441,7 @@
 		do {
 			nread = read (gpg->stdout_fd, buffer, sizeof (buffer));
 		} while (nread == -1 && (errno == EINTR || errno == EAGAIN));
+		
 		if (nread == -1)
 			goto exception;
 		
@@ -1428,6 +1462,7 @@
 		do {
 			nread = read (gpg->stderr_fd, buffer, sizeof (buffer));
 		} while (nread == -1 && (errno == EINTR || errno == EAGAIN));
+		
 		if (nread == -1)
 			goto exception;
 		
@@ -1438,32 +1473,60 @@
 		}
 	}
 	
-	if ((pfds[GPG_PASSWD_FD].revents & (POLLOUT | POLLHUP)) && gpg->need_passwd && gpg->send_passwd) {
-		size_t n, nwritten = 0;
-		ssize_t w;
-		
-		d(printf ("sending gpg our passphrase...\n"));
-		
-		/* send the passphrase to gpg */
-		n = strlen (gpg->passwd);
-		do {
+	if ((pfds[GPG_SECRET_FD].revents & (POLLOUT | POLLHUP))) {
+		if (gpg->need_passwd && gpg->send_passwd) {
+			size_t n, nwritten = 0;
+			ssize_t w;
+			
+			d(printf ("sending gpg our passphrase...\n"));
+			
+			/* send the passphrase to gpg */
+			n = strlen (gpg->passwd);
 			do {
-				w = write (gpg->passwd_fd, gpg->passwd + nwritten, n - nwritten);
-			} while (w == -1 && (errno == EINTR || errno == EAGAIN));
-			
-			if (w > 0)
-				nwritten += w;
-		} while (nwritten < n && w != -1);
-		
-		/* zero and free our passwd buffer */
-		memset (gpg->passwd, 0, n);
-		g_free (gpg->passwd);
-		gpg->passwd = NULL;
-		
-		if (w == -1)
-			goto exception;
-		
-		gpg->send_passwd = FALSE;
+				do {
+					w = write (gpg->secret_fd, gpg->passwd + nwritten, n - nwritten);
+				} while (w == -1 && (errno == EINTR || errno == EAGAIN));
+				
+				if (w > 0)
+					nwritten += w;
+			} while (nwritten < n && w != -1);
+			
+			/* zero and free our passwd buffer */
+			memset (gpg->passwd, 0, n);
+			g_free (gpg->passwd);
+			gpg->passwd = NULL;
+			
+			if (w == -1)
+				goto exception;
+			
+			gpg->send_passwd = FALSE;
+		} else if (gpg->mode == GPG_CTX_MODE_VERIFY) {
+			ssize_t nread, w, nwritten = 0;
+			char buffer[4096];
+			
+			d(printf ("sending gpg our digital signature...\n"));
+			
+			/* write our stream to gpg's sig fd */
+			nread = g_mime_stream_read (gpg->sigstream, buffer, sizeof (buffer));
+			if (nread > 0) {
+				do {
+					do {
+						w = write (gpg->secret_fd, buffer + nwritten, nread - nwritten);
+					} while (w == -1 && (errno == EINTR || errno == EAGAIN));
+					
+					if (w > 0)
+						nwritten += w;
+				} while (nwritten < nread && w != -1);
+				
+				if (w == -1)
+					goto exception;
+			}
+			
+			if (g_mime_stream_eos (gpg->sigstream)) {
+				close (gpg->secret_fd);
+				gpg->secret_fd = -1;
+			}
+		}
 	}
 	
 	if ((pfds[GPG_STDIN_FD].revents & (POLLOUT | POLLHUP)) && gpg->istream) {
@@ -1670,7 +1733,7 @@
 		diagnostics = gpg_ctx_get_diagnostics (gpg);
 		errno = save;
 		
-		g_set_error (err, GMIME_ERROR, errno, diagnostics);
+		g_set_error_literal (err, GMIME_ERROR, errno, diagnostics);
 		gpg_ctx_free (gpg);
 		
 		return -1;
@@ -1684,35 +1747,6 @@
 	return hash;
 }
 
-
-static char *
-swrite (GMimeStream *istream)
-{
-	GMimeStream *ostream;
-	char *template;
-	int fd, ret;
-	
-	template = g_build_filename (g_get_tmp_dir (), "gmime-pgp.XXXXXX", NULL);
-	if ((fd = mkstemp (template)) == -1) {
-		g_free (template);
-		return NULL;
-	}
-	
-	ostream = g_mime_stream_fs_new (fd);
-	if ((ret = g_mime_stream_write_to_stream (istream, ostream)) != -1) {
-		if ((ret = g_mime_stream_flush (ostream)) != -1)
-			ret = g_mime_stream_close (ostream);
-	}
-	g_object_unref (ostream);
-	
-	if (ret == -1) {
-		unlink (template);
-		g_free (template);
-		return NULL;
-	}
-	
-	return template;
-}
 
 static GMimeSignatureValidity *
 gpg_verify (GMimeCipherContext *context, GMimeCipherHash hash,
@@ -1723,38 +1757,28 @@
 	GMimeSignatureValidity *validity;
 	const char *diagnostics;
 	struct _GpgCtx *gpg;
-	char *sigfile = NULL;
 	gboolean valid;
-	
-	if (sigstream != NULL) {
-		/* We are going to verify a detached signature so save
-		   the signature to a temp file. */
-		if (!(sigfile = swrite (sigstream))) {
-			g_set_error (err, GMIME_ERROR, errno,
-				     _("Cannot verify message signature: "
-				       "could not create temp file: %s"),
-				     g_strerror (errno));
-			return NULL;
-		}
-	}
 	
 	gpg = gpg_ctx_new (context->session, ctx->path);
 	gpg_ctx_set_mode (gpg, GPG_CTX_MODE_VERIFY);
+	gpg_ctx_set_sigstream (gpg, sigstream);
+	gpg_ctx_set_istream (gpg, istream);
 	gpg_ctx_set_hash (gpg, hash);
-	gpg_ctx_set_sigfile (gpg, sigfile);
-	gpg_ctx_set_istream (gpg, istream);
 	
 	if (gpg_ctx_op_start (gpg) == -1) {
 		g_set_error (err, GMIME_ERROR, errno,
 			     _("Failed to execute gpg: %s"),
 			     errno ? g_strerror (errno) : _("Unknown"));
-		goto exception;
+		gpg_ctx_free (gpg);
+		
+		return NULL;
 	}
 	
 	while (!gpg_ctx_op_complete (gpg)) {
 		if (gpg_ctx_op_step (gpg, err) == -1) {
 			gpg_ctx_op_cancel (gpg);
-			goto exception;
+			gpg_ctx_free (gpg);
+			return NULL;
 		}
 	}
 	
@@ -1781,23 +1805,7 @@
 	
 	gpg_ctx_free (gpg);
 	
-	if (sigfile) {
-		unlink (sigfile);
-		g_free (sigfile);
-	}
-	
 	return validity;
-	
- exception:
-	
-	gpg_ctx_free (gpg);
-	
-	if (sigfile) {
-		unlink (sigfile);
-		g_free (sigfile);
-	}
-	
-	return NULL;
 }
 
 
@@ -1850,7 +1858,7 @@
 		diagnostics = gpg_ctx_get_diagnostics (gpg);
 		errno = save;
 		
-		g_set_error (err, GMIME_ERROR, errno, diagnostics);
+		g_set_error_literal (err, GMIME_ERROR, errno, diagnostics);
 		gpg_ctx_free (gpg);
 		
 		return -1;
@@ -1900,7 +1908,7 @@
 		diagnostics = gpg_ctx_get_diagnostics (gpg);
 		errno = save;
 		
-		g_set_error (err, GMIME_ERROR, errno, diagnostics);
+		g_set_error_literal (err, GMIME_ERROR, errno, diagnostics);
 		gpg_ctx_free (gpg);
 		
 		return NULL;
@@ -1969,7 +1977,7 @@
 		diagnostics = gpg_ctx_get_diagnostics (gpg);
 		errno = save;
 		
-		g_set_error (err, GMIME_ERROR, errno, diagnostics);
+		g_set_error_literal (err, GMIME_ERROR, errno, diagnostics);
 		gpg_ctx_free (gpg);
 		
 		return -1;
@@ -2022,7 +2030,7 @@
 		diagnostics = gpg_ctx_get_diagnostics (gpg);
 		errno = save;
 		
-		g_set_error (err, GMIME_ERROR, errno, diagnostics);
+		g_set_error_literal (err, GMIME_ERROR, errno, diagnostics);
 		gpg_ctx_free (gpg);
 		
 		return -1;

Modified: packages/unstable/gmime2.4/gmime/gmime-gpg-context.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-gpg-context.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-gpg-context.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-gpg-context.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-header.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-header.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-header.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-header.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-header.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-header.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-header.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-header.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-iconv-utils.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-iconv-utils.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-iconv-utils.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-iconv-utils.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-iconv-utils.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-iconv-utils.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-iconv-utils.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-iconv-utils.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-iconv.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-iconv.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-iconv.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-iconv.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-iconv.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-iconv.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-iconv.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-iconv.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-message-part.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-message-part.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-message-part.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-message-part.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-message-part.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-message-part.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-message-part.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-message-part.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-message-partial.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-message-partial.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-message-partial.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-message-partial.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-message-partial.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-message-partial.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-message-partial.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-message-partial.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-message.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-message.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-message.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-message.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -661,6 +661,7 @@
 	HEADER_SUBJECT,
 	HEADER_DATE,
 	HEADER_MESSAGE_ID,
+	HEADER_MIME_VERSION,
 	HEADER_UNKNOWN
 };
 
@@ -673,6 +674,7 @@
 	"Subject",
 	"Date",
 	"Message-Id",
+	"MIME-Version",
 };
 
 enum {
@@ -764,6 +766,8 @@
 		g_free (message->message_id);
 		message->message_id = g_mime_utils_decode_message_id (value);
 		break;
+	case HEADER_MIME_VERSION:
+		break;
 	default:
 		return FALSE;
 	}
@@ -775,9 +779,6 @@
 message_prepend_header (GMimeObject *object, const char *header, const char *value)
 {
 	GMimeMessage *message = (GMimeMessage *) object;
-	
-	if (!g_ascii_strcasecmp ("MIME-Version", header))
-		return;
 	
 	/* Make sure that the header is not a Content-* header, else it
            doesn't belong on a message */
@@ -798,9 +799,6 @@
 {
 	GMimeMessage *message = (GMimeMessage *) object;
 	
-	if (!g_ascii_strcasecmp ("MIME-Version", header))
-		return;
-	
 	/* Make sure that the header is not a Content-* header, else it
            doesn't belong on a message */
 	if (!g_ascii_strncasecmp ("Content-", header, 8))
@@ -820,9 +818,6 @@
 {
 	GMimeMessage *message = (GMimeMessage *) object;
 	
-	if (!g_ascii_strcasecmp ("MIME-Version", header))
-		return;
-	
 	/* Make sure that the header is not a Content-* header, else it
            doesn't belong on a message */
 	if (!g_ascii_strncasecmp ("Content-", header, 8))
@@ -841,18 +836,21 @@
 message_get_header (GMimeObject *object, const char *header)
 {
 	GMimeMessage *message = (GMimeMessage *) object;
-	
-	if (!g_ascii_strcasecmp ("MIME-Version", header))
-		return "1.0";
+	const char *value;
 	
 	/* Make sure that the header is not a Content-* header, else it
            doesn't belong on a message */
-	if (g_ascii_strncasecmp ("Content-", header, 8) != 0)
-		return GMIME_OBJECT_CLASS (parent_class)->get_header (object, header);
-	else if (message->mime_part)
+	if (g_ascii_strncasecmp ("Content-", header, 8) != 0) {
+		if ((value = GMIME_OBJECT_CLASS (parent_class)->get_header (object, header)))
+			return value;
+		
+		if (!g_ascii_strcasecmp ("MIME-Version", header))
+			return "1.0";
+	} else if (message->mime_part) {
 		return g_mime_object_get_header (message->mime_part, header);
-	else
-		return NULL;
+	}
+	
+	return NULL;
 }
 
 static gboolean
@@ -862,9 +860,6 @@
 	InternetAddressList *addrlist;
 	GMimeRecipientType type;
 	guint i;
-	
-	if (!g_ascii_strcasecmp ("MIME-Version", header))
-		return FALSE;
 	
 	/* Make sure that the header is not a Content-* header, else it
            doesn't belong on a message */
@@ -956,7 +951,8 @@
 		
 		g_mime_header_list_write_to_stream (object->headers, stream);
 		if (message->mime_part) {
-			if (g_mime_object_get_header (message->mime_part, "Content-Type"))
+			if (g_mime_object_get_header (message->mime_part, "Content-Type") &&
+			    !g_mime_header_list_get (object->headers, "MIME-Version"))
 				g_mime_stream_write_string (stream, "MIME-Version: 1.0\n");
 			g_mime_header_list_write_to_stream (message->mime_part->headers, stream);
 		}
@@ -988,8 +984,10 @@
 			
 			total += nwritten;
 			
-			if ((nwritten = g_mime_stream_write_string (stream, "MIME-Version: 1.0\n")) == -1)
-				return -1;
+			if (!g_mime_header_list_get (object->headers, "MIME-Version")) {
+				if ((nwritten = g_mime_stream_write_string (stream, "MIME-Version: 1.0\n")) == -1)
+					return -1;
+			}
 			
 			total += nwritten;
 		}

Modified: packages/unstable/gmime2.4/gmime/gmime-message.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-message.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-message.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-message.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -42,7 +42,7 @@
 
 /**
  * SECTION: gmime-multipart-encrypted
- * @title: GMimeMultpartEncrypted
+ * @title: GMimeMultipartEncrypted
  * @short_description: Encrypted MIME multiparts
  * @see_also: #GMimeMultipart
  *
@@ -213,7 +213,7 @@
  * g_mime_multipart_encrypted_encrypt:
  * @mpe: multipart/encrypted object
  * @content: MIME part to encrypt
- * @ctx: encryption cipher context
+ * @ctx: encryption context
  * @sign: %TRUE if the content should also be signed or %FALSE otherwise
  * @userid: user id to use for signing (only used if @sign is %TRUE)
  * @recipients: an array of recipients to encrypt to
@@ -315,19 +315,23 @@
 /**
  * g_mime_multipart_encrypted_decrypt:
  * @mpe: multipart/encrypted object
- * @ctx: decryption cipher context
+ * @ctx: decryption context
  * @err: a #GError
  *
  * Attempts to decrypt the encrypted MIME part contained within the
- * multipart/encrypted object @mpe using the @ctx decryption context.
- *
- * If @validity is non-NULL, then on a successful decrypt operation,
- * it will be updated to point to a newly-allocated
- * #GMimeSignatureValidity with signature status information.
- *
- * Returns: the decrypted MIME part on success or %NULL on fail. If the
- * decryption fails, an exception will be set on @err to provide
+ * multipart/encrypted object @mpe using the @ctx decryption
+ * context.
+ *
+ * For information regarding the signature status (in cases where the
+ * MIME part was both encrypted and signed), you may wish to check the
+ * results of g_mime_multipart_encrypted_get_signature_validity().
+ *
+ * Returns: the decrypted MIME part on success or %NULL on fail. If
+ * the decryption fails, an exception will be set on @err to provide
  * information as to why the failure occured.
+ *
+ * Note: On success, the decrypted MIME part is cached internally and
+ * so the returned #GMimeObject must NOT be unreffed.
  **/
 GMimeObject *
 g_mime_multipart_encrypted_decrypt (GMimeMultipartEncrypted *mpe, GMimeCipherContext *ctx,
@@ -359,7 +363,8 @@
 		/* make sure the protocol matches the cipher encrypt protocol */
 		if (g_ascii_strcasecmp (ctx->encrypt_protocol, protocol) != 0) {
 			g_set_error (err, GMIME_ERROR, GMIME_ERROR_PROTOCOL_ERROR,
-				     "Failed to decrypt MIME part: protocol error");
+				     "Cannot decrypt multipart/encrypted part: unsupported encryption protocol '%s'.",
+				     protocol);
 			
 			return NULL;
 		}
@@ -373,8 +378,8 @@
 	/* make sure the protocol matches the version part's content-type */
 	content_type = g_mime_content_type_to_string (version->content_type);
 	if (g_ascii_strcasecmp (content_type, protocol) != 0) {
-		g_set_error (err, GMIME_ERROR, GMIME_ERROR_PROTOCOL_ERROR,
-			     "Failed to decrypt MIME part: protocol error");
+		g_set_error (err, GMIME_ERROR, GMIME_ERROR_PROTOCOL_ERROR, "%s",
+			     "Cannot decrypt multipart/encrypted part: content-type does not match protocol.");
 		
 		g_free (content_type);
 		
@@ -386,7 +391,9 @@
 	encrypted = g_mime_multipart_get_part (GMIME_MULTIPART (mpe), GMIME_MULTIPART_ENCRYPTED_CONTENT);
 	mime_type = g_mime_object_get_content_type (encrypted);
 	if (!g_mime_content_type_is_type (mime_type, "application", "octet-stream")) {
-		g_object_unref (encrypted);
+		g_set_error (err, GMIME_ERROR, GMIME_ERROR_PROTOCOL_ERROR, "%s",
+			     "Cannot decrypt multipart/encrypted part: unexpected content type");
+		
 		return NULL;
 	}
 	
@@ -421,8 +428,8 @@
 	g_object_unref (parser);
 	
 	if (!decrypted) {
-		g_set_error (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
-			     "Failed to decrypt MIME part: parse error");
+		g_set_error (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR, "%s",
+			     "Cannot decrypt multipart/encrypted part: failed to parse decrypted content");
 		
 		g_mime_signature_validity_free (sv);
 		

Modified: packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-multipart-encrypted.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-multipart-signed.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-multipart-signed.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-multipart-signed.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-multipart-signed.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -42,7 +42,7 @@
 
 /**
  * SECTION: gmime-multipart-signed
- * @title: GMimeMultpartSigned
+ * @title: GMimeMultipartSigned
  * @short_description: Signed MIME multiparts
  * @see_also: #GMimeMultipart
  *
@@ -408,8 +408,12 @@
 	
 	if (protocol) {
 		/* make sure the protocol matches the cipher sign protocol */
-		if (g_ascii_strcasecmp (ctx->sign_protocol, protocol) != 0)
+		if (g_ascii_strcasecmp (ctx->sign_protocol, protocol) != 0) {
+			g_set_error (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR,
+				     "Cannot verify multipart/signed part: unsupported signature protocol '%s'.",
+				     protocol);
 			return NULL;
+		}
 	} else {
 		/* *shrug* - I guess just go on as if they match? */
 		protocol = ctx->sign_protocol;
@@ -420,6 +424,8 @@
 	/* make sure the protocol matches the signature content-type */
 	content_type = g_mime_content_type_to_string (signature->content_type);
 	if (g_ascii_strcasecmp (content_type, protocol) != 0) {
+		g_set_error (err, GMIME_ERROR, GMIME_ERROR_PARSE_ERROR, "%s",
+			     "Cannot verify multipart/signed part: signature content-type does not match protocol.");
 		g_free (content_type);
 		
 		return NULL;

Modified: packages/unstable/gmime2.4/gmime/gmime-multipart-signed.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-multipart-signed.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-multipart-signed.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-multipart-signed.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-multipart.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-multipart.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-multipart.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-multipart.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-multipart.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-multipart.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-multipart.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-multipart.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-object.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-object.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-object.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-object.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -75,8 +75,6 @@
 
 static void content_type_changed (GMimeContentType *content_type, GMimeObject *object);
 static void content_disposition_changed (GMimeContentDisposition *disposition, GMimeObject *object);
-
-static void type_registry_init (void);
 
 
 static GHashTable *type_hash = NULL;
@@ -127,8 +125,6 @@
 	klass->set_content_type = set_content_type;
 	klass->get_headers = get_headers;
 	klass->write_to_stream = write_to_stream;
-	
-	type_registry_init ();
 }
 
 static void
@@ -279,8 +275,6 @@
 	g_return_if_fail (object_type != 0);
 	g_return_if_fail (subtype != NULL);
 	g_return_if_fail (type != NULL);
-	
-	type_registry_init ();
 	
 	if (!(bucket = g_hash_table_lookup (type_hash, type))) {
 		bucket = g_new (struct _type_bucket, 1);
@@ -321,8 +315,6 @@
 	GType obj_type;
 	
 	g_return_val_if_fail (GMIME_IS_CONTENT_TYPE (content_type), NULL);
-	
-	type_registry_init ();
 	
 	if ((bucket = g_hash_table_lookup (type_hash, content_type->type))) {
 		if (!(sub = g_hash_table_lookup (bucket->subtype_hash, content_type->subtype)))
@@ -376,8 +368,6 @@
 	GType obj_type;
 	
 	g_return_val_if_fail (type != NULL, NULL);
-	
-	type_registry_init ();
 	
 	if ((bucket = g_hash_table_lookup (type_hash, type))) {
 		if (!(sub = g_hash_table_lookup (bucket->subtype_hash, subtype)))
@@ -1061,20 +1051,19 @@
 	g_free (bucket);
 }
 
-static void
-type_registry_shutdown (void)
+void
+g_mime_object_type_registry_shutdown (void)
 {
 	g_hash_table_foreach (type_hash, type_bucket_foreach, NULL);
 	g_hash_table_destroy (type_hash);
-}
-
-static void
-type_registry_init (void)
+	type_hash = NULL;
+}
+
+void
+g_mime_object_type_registry_init (void)
 {
 	if (type_hash)
 		return;
 	
 	type_hash = g_hash_table_new (g_mime_strcase_hash, g_mime_strcase_equal);
-	
-	g_atexit (type_registry_shutdown);
-}
+}

Modified: packages/unstable/gmime2.4/gmime/gmime-object.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-object.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-object.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-object.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -128,6 +128,10 @@
 ssize_t g_mime_object_write_to_stream (GMimeObject *object, GMimeStream *stream);
 char *g_mime_object_to_string (GMimeObject *object);
 
+/* Internal API */
+G_GNUC_INTERNAL void g_mime_object_type_registry_init (void);
+G_GNUC_INTERNAL void g_mime_object_type_registry_shutdown (void);
+
 G_END_DECLS
 
 #endif /* __GMIME_OBJECT_H__ */

Modified: packages/unstable/gmime2.4/gmime/gmime-param.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-param.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-param.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-param.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -173,8 +173,21 @@
 	decode_lwsp (&inptr);
 	
 	start = inptr;
+#ifdef STRICT_PARSER
 	while (is_ttoken (*inptr))
 		inptr++;
+#else
+	/* Broken mail clients like to make our lives difficult. Scan
+	 * for a ';' instead of trusting that the client followed the
+	 * specification. */
+	while (*inptr && *inptr != ';')
+		inptr++;
+	
+	/* Scan backwards over any trailing lwsp */
+	while (inptr > start && is_lwsp (inptr[-1]))
+		inptr--;
+#endif
+	
 	if (inptr > start) {
 		*in = inptr;
 		return g_strndup (start, (size_t) (inptr - start));

Modified: packages/unstable/gmime2.4/gmime/gmime-param.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-param.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-param.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-param.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-parse-utils.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-parse-utils.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-parse-utils.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-parse-utils.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-parse-utils.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-parse-utils.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-parse-utils.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-parse-utils.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-parser.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-parser.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-parser.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-parser.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-parser.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-parser.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-parser.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-parser.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-part.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-part.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-part.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-part.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-part.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-part.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-part.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-part.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-session-simple.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-session-simple.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-session-simple.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-session-simple.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-session-simple.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-session-simple.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-session-simple.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-session-simple.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-session.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-session.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-session.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-session.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-session.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-session.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-session.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-session.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-buffer.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-buffer.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-buffer.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-buffer.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-cat.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-cat.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-cat.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-cat.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-cat.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-cat.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-cat.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-cat.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-file.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-file.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-file.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-file.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-file.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-file.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-file.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-file.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-filter.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-filter.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-filter.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-filter.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-filter.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-filter.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-filter.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-filter.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-fs.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-fs.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-fs.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-fs.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-fs.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-fs.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-fs.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-fs.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-mem.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-mem.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-mem.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-mem.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -163,8 +163,10 @@
 		return -1;
 	}
 	
-	if (stream->bound_end == -1 && stream->position + len > mem->buffer->len) {
-		g_byte_array_set_size (mem->buffer, stream->position + len);
+	if (stream->bound_end == -1) {
+		if (stream->position + len > mem->buffer->len)
+			g_byte_array_set_size (mem->buffer, stream->position + len);
+		
 		bound_end = mem->buffer->len;
 	} else
 		bound_end = stream->bound_end;

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-mem.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-mem.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-mem.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-mem.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-mmap.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-mmap.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-mmap.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-mmap.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-mmap.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-mmap.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-mmap.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-mmap.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-null.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-null.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-null.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-null.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-null.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-null.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-null.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-null.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-stream.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime-utils.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-utils.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-utils.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-utils.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -476,7 +476,7 @@
 	tm->tm_isdst = -1;
 	tt = mktime (tm);
 	
-#if defined (G_OS_WIN32)
+#if defined (G_OS_WIN32) && !defined (__MINGW32__)
 	_get_timezone (&tz);
 	if (tm->tm_isdst > 0) {
 		int dst;
@@ -1877,7 +1877,7 @@
 			word = inptr;
 			ascii = TRUE;
 			
-			if (enable_rfc2047_workarounds) {
+			if (G_UNLIKELY (enable_rfc2047_workarounds)) {
 				if (!strncmp (inptr, "=?", 2)) {
 					inptr += 2;
 					
@@ -1899,8 +1899,15 @@
 						inptr++;
 					}
 					
-					if (!strncmp (inptr, "?=", 2))
-						inptr += 2;
+					if (*inptr == '\0') {
+						/* didn't find an end marker... */
+						inptr = word + 2;
+						ascii = TRUE;
+						
+						goto non_rfc2047;
+					}
+					
+					inptr += 2;
 				} else {
 				non_rfc2047:
 					/* stop if we encounter a possible rfc2047 encoded
@@ -1981,9 +1988,10 @@
 char *
 g_mime_utils_header_decode_phrase (const char *phrase)
 {
+	gboolean enable_rfc2047_workarounds = _g_mime_enable_rfc2047_workarounds ();
 	register const char *inptr = phrase;
 	gboolean encoded = FALSE;
-	const char *lwsp, *text;
+	const char *lwsp, *word;
 	size_t nlwsp, n;
 	gboolean ascii;
 	char *decoded;
@@ -2001,14 +2009,53 @@
 		
 		nlwsp = (size_t) (inptr - lwsp);
 		
-		text = inptr;
+		word = inptr;
 		if (is_atom (*inptr)) {
-			while (is_atom (*inptr))
-				inptr++;
-			
-			n = (size_t) (inptr - text);
-			if (is_rfc2047_encoded_word (text, n)) {
-				if ((decoded = rfc2047_decode_word (text, n))) {
+			if (G_UNLIKELY (enable_rfc2047_workarounds)) {
+				/* Make an extra effort to detect and
+				 * separate encoded-word tokens that
+				 * have been merged with other
+				 * words. */
+				
+				if (!strncmp (inptr, "=?", 2)) {
+					inptr += 2;
+					
+					/* skip past the charset (if one is even declared, sigh) */
+					while (*inptr && *inptr != '?')
+						inptr++;
+					
+					/* sanity check encoding type */
+					if (inptr[0] != '?' || !strchr ("BbQq", inptr[1]) || inptr[2] != '?')
+						goto non_rfc2047;
+					
+					inptr += 3;
+					
+					/* find the end of the rfc2047 encoded word token */
+					while (*inptr && strncmp (inptr, "?=", 2) != 0)
+						inptr++;
+					
+					if (*inptr == '\0') {
+						/* didn't find an end marker... */
+						inptr = word + 2;
+						goto non_rfc2047;
+					}
+					
+					inptr += 2;
+				} else {
+				non_rfc2047:
+					/* stop if we encounter a possible rfc2047 encoded
+					 * token even if it's inside another word, sigh. */
+					while (is_atom (*inptr) && strncmp (inptr, "=?", 2) != 0)
+						inptr++;
+				}
+			} else {
+				while (is_atom (*inptr))
+					inptr++;
+			}
+			
+			n = (size_t) (inptr - word);
+			if (is_rfc2047_encoded_word (word, n)) {
+				if ((decoded = rfc2047_decode_word (word, n))) {
 					/* rfc2047 states that you must ignore all
 					 * whitespace between encoded words */
 					if (!encoded)
@@ -2032,20 +2079,20 @@
 			g_string_append_len (out, lwsp, nlwsp);
 			
 			ascii = TRUE;
-			while (*inptr && !is_lwsp (*inptr)) {
+			while (*inptr && !is_lwsp (*inptr) && !is_atom (*inptr)) {
 				ascii = ascii && is_ascii (*inptr);
 				inptr++;
 			}
 			
-			n = (size_t) (inptr - text);
+			n = (size_t) (inptr - word);
 			
 			if (!ascii) {
 				/* *sigh* I hate broken mailers... */
-				decoded = g_mime_utils_decode_8bit (text, n);
+				decoded = g_mime_utils_decode_8bit (word, n);
 				g_string_append (out, decoded);
 				g_free (decoded);
 			} else {
-				g_string_append_len (out, text, n);
+				g_string_append_len (out, word, n);
 			}
 			
 			encoded = FALSE;

Modified: packages/unstable/gmime2.4/gmime/gmime-utils.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-utils.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-utils.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-utils.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/gmime.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -119,6 +119,7 @@
 	internet_address_mailbox_get_type ();
 	
 	/* register our default mime object types */
+	g_mime_object_type_registry_init ();
 	g_mime_object_register_type ("*", "*", g_mime_part_get_type ());
 	g_mime_object_register_type ("multipart", "*", g_mime_multipart_get_type ());
 	g_mime_object_register_type ("multipart", "encrypted", g_mime_multipart_encrypted_get_type ());
@@ -142,6 +143,7 @@
 	if (--initialized)
 		return;
 	
+	g_mime_object_type_registry_shutdown ();
 	g_mime_charset_map_shutdown ();
 	g_mime_iconv_shutdown ();
 }

Modified: packages/unstable/gmime2.4/gmime/gmime.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/gmime/internet-address.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/internet-address.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/internet-address.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/internet-address.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
@@ -286,15 +286,9 @@
 {
 	char *buf;
 	
-	if (name) {
-		buf = g_mime_utils_header_decode_phrase (name);
-		g_mime_utils_unquote_string (buf);
-		g_free (ia->name);
-		ia->name = buf;
-	} else {
-		g_free (ia->name);
-		ia->name = NULL;
-	}
+	buf = g_strdup (name);
+	g_free (ia->name);
+	ia->name = buf;
 }
 
 /**
@@ -446,8 +440,7 @@
 	mailbox = g_object_newv (INTERNET_ADDRESS_TYPE_MAILBOX, 0, NULL);
 	mailbox->addr = g_strdup (addr);
 	
-	if (name != NULL)
-		_internet_address_set_name ((InternetAddress *) mailbox, name);
+	_internet_address_set_name ((InternetAddress *) mailbox, name);
 	
 	return (InternetAddress *) mailbox;
 }
@@ -1219,7 +1212,7 @@
 				*linelen += len;
 			}
 		} else {
-			/* we can safly fit the name on this line */
+			/* we can safely fit the name on this line */
 			g_string_append_len (string, name, len);
 			*linelen += len;
 		}
@@ -1276,18 +1269,21 @@
 	InternetAddressGroup *group = (InternetAddressGroup *) ia;
 	gboolean encode = flags & INTERNET_ADDRESS_ENCODE;
 	gboolean fold = flags & INTERNET_ADDRESS_FOLD;
-	char *name;
-	size_t len;
-	
-	name = encoded_name (ia->name, encode);
-	len = strlen (name);
-	
-	if (fold && *linelen > 1 && (*linelen + len + 1) > GMIME_FOLD_LEN) {
-		linewrap (string);
-		*linelen = 1;
-	}
-	
-	g_string_append_len (string, name, len);
+	char *name = NULL;
+	size_t len = 0;
+	
+	if (ia->name != NULL) {
+		name = encoded_name (ia->name, encode);
+		len = strlen (name);
+		
+		if (fold && *linelen > 1 && (*linelen + len + 1) > GMIME_FOLD_LEN) {
+			linewrap (string);
+			*linelen = 1;
+		}
+		
+		g_string_append_len (string, name, len);
+	}
+	
 	g_string_append_len (string, ": ", 2);
 	*linelen += len + 2;
 	g_free (name);
@@ -1352,82 +1348,70 @@
 	_internet_address_list_to_string (list, flags, &linelen, str);
 }
 
+static void
+_internet_address_decode_name (InternetAddress *ia, GString *name)
+{
+	char *value, *buf = NULL;
+	char *phrase;
+	
+	if (!g_utf8_validate (name->str, name->len, NULL)) {
+		/* A (broken) mailer has sent us raw 8bit/multibyte text data... */
+		buf = g_mime_utils_decode_8bit (name->str, name->len);
+		phrase = buf;
+	} else {
+		phrase = name->str;
+	}
+	
+	/* decode the phrase */
+	g_mime_utils_unquote_string (phrase);
+	value = g_mime_utils_header_decode_phrase (phrase);
+	g_free (ia->name);
+	ia->name = value;
+	g_free (buf);
+}
+
+static InternetAddress *decode_address (const char **in);
+
+static void
+skip_lwsp (const char **in)
+{
+	register const char *inptr = *in;
+	
+	while (*inptr && is_lwsp (*inptr))
+		inptr++;
+	
+	*in = inptr;
+}
+
 static InternetAddress *
-decode_mailbox (const char **in)
+decode_addrspec (const char **in)
 {
 	InternetAddress *mailbox = NULL;
-	const char *inptr, *word;
-	gboolean bracket = FALSE;
-	GString *name = NULL;
+	const char *start, *inptr, *word;
+	gboolean got_local = FALSE;
 	GString *addr;
-	size_t n = 0;
+	size_t len;
 	
 	addr = g_string_new ("");
-	
-	decode_lwsp (in);
 	inptr = *in;
 	
-	if ((word = decode_word (&inptr)))
-		n = inptr - word;
-	
 	decode_lwsp (&inptr);
-	if (*inptr && !strchr (",.@", *inptr)) {
-		gboolean retried = FALSE;
-		
-		/* this mailbox has a name part, so get the name */
-		name = g_string_new ("");
-		while (word) {
-			g_string_append_len (name, word, n);
-			retried = FALSE;
-		retry:
-			if ((word = decode_word (&inptr))) {
-				g_string_append_c (name, ' ');
-				n = inptr - word;
-			}
-		}
-		
+	
+	/* some spam bots set their addresses to stuff like: ).ORHH at em.ca */
+	while (*inptr && !(*inptr == '"' || is_atom (*inptr)))
+		inptr++;
+	
+	start = inptr;
+	
+	/* extract the first word of the local-part */
+	if ((word = decode_word (&inptr))) {
+		g_string_append_len (addr, word, (size_t) (inptr - word));
 		decode_lwsp (&inptr);
-		if (*inptr == '<') {
-			inptr++;
-			bracket = TRUE;
-			if ((word = decode_word (&inptr)))
-				n = inptr - word;
-		} else if (!retried && *inptr) {
-			w(g_warning ("Unexpected char '%c' in mailbox: %s: attempting recovery.",
-				     *inptr, *in));
-			/* chew up this bad char and then attempt 1 more pass at parsing */
-			g_string_append_c (name, *inptr++);
-			retried = TRUE;
-			goto retry;
-		} else {
-			g_string_free (name, TRUE);
-			g_string_free (addr, TRUE);
-			*in = inptr;
-			
-			return NULL;
-		}
-	}
-	
-	if (word) {
-		g_string_append_len (addr, word, n);
-	} else {
-		w(g_warning ("No local part for email address: %s", *in));
-		if (name)
-			g_string_free (name, TRUE);
-		g_string_free (addr, TRUE);
-		
-		/* comma will be eaten by our caller */
-		if (*inptr && *inptr != ',')
-			*in = inptr + 1;
-		else
-			*in = inptr;
-		
-		return NULL;
-	}
-	
-	/* get the rest of the local-part */
-	decode_lwsp (&inptr);
-	while (*inptr == '.' && word) {
+		got_local = TRUE;
+	}
+	
+	/* extract the rest of the local-part */
+	while (word && *inptr == '.') {
 		/* Note: According to the spec, only a single '.' is
 		 * allowed between word tokens in the local-part of an
 		 * addr-spec token, but according to Evolution bug
@@ -1445,144 +1429,238 @@
 		decode_lwsp (&inptr);
 	}
 	
-	/* we should be at the '@' now... */
 	if (*inptr == '@') {
-		size_t len = addr->len;
+		len = addr->len;
 		
 		g_string_append_c (addr, '@');
 		inptr++;
 		
-		if (!decode_domain (&inptr, addr))
+		if (!decode_domain (&inptr, addr)) {
+			/* drop the @domain and continue as if it weren't there */
+			w(g_warning ("Missing domain in addr-spec: %.*s",
+				     inptr - start, start));
 			g_string_truncate (addr, len);
-	} else {
-		w(g_warning ("No domain in email address: %s", *in));
-	}
-	
-	if (bracket) {
+		}
+	} else if (got_local) {
+		w(g_warning ("Missing '@' and domain in addr-spec: %.*s",
+			     inptr - start, start));
+	}
+	
+	*in = inptr;
+	
+	if (!got_local) {
+		w(g_warning ("Invalid addr-spec, missing local-part: %.*s",
+			     inptr - start, start));
+		g_string_free (addr, TRUE);
+		return NULL;
+	}
+	
+	mailbox = g_object_newv (INTERNET_ADDRESS_TYPE_MAILBOX, 0, NULL);
+	((InternetAddressMailbox *) mailbox)->addr = addr->str;
+	g_string_free (addr, FALSE);
+	
+	return mailbox;
+}
+
+static InternetAddress *
+decode_group (const char **in)
+{
+	InternetAddressGroup *group;
+	InternetAddress *addr;
+	const char *inptr;
+	
+	inptr = *in;
+	
+	addr = internet_address_group_new (NULL);
+	group = (InternetAddressGroup *) addr;
+	
+	decode_lwsp (&inptr);
+	while (*inptr && *inptr != ';') {
+		InternetAddress *member;
+		
+		if ((member = decode_address (&inptr)))
+			_internet_address_group_add_member (group, member);
+		
 		decode_lwsp (&inptr);
-		if (*inptr == '>')
+		while (*inptr == ',') {
 			inptr++;
-		else
-			w(g_warning ("Missing closing '>' bracket for email address: %s", *in));
-	}
-	
-	if (!name || !name->len) {
-		/* look for a trailing comment to use as the name? */
-		char *comment;
-		
-		if (name) {
-			g_string_free (name, TRUE);
-			name = NULL;
-		}
-		
-		comment = (char *) inptr;
-		decode_lwsp (&inptr);
-		if (inptr > comment) {
-			if ((comment = memchr (comment, '(', inptr - comment))) {
-				const char *cend;
-				
-				/* find the end of the comment */
-				cend = inptr - 1;
-				while (cend > comment && is_lwsp (*cend))
-					cend--;
-				
-				if (*cend == ')')
-					cend--;
-				
-				comment = g_strndup (comment + 1, (size_t) (cend - comment));
-				g_strstrip (comment);
-				
-				name = g_string_new (comment);
-				g_free (comment);
-			}
-		}
-	}
-	
-	*in = inptr;
-	
-	if (addr->len) {
-		if (name && !g_utf8_validate (name->str, name->len, NULL)) {
-			/* A (broken) mailer has sent us raw 8bit/multibyte text data... */
-			char *utf8 = g_mime_utils_decode_8bit (name->str, name->len);
-			
-			g_string_truncate (name, 0);
-			g_string_append (name, utf8);
-			g_free (utf8);
-		}
-		
-		mailbox = g_object_newv (INTERNET_ADDRESS_TYPE_MAILBOX, 0, NULL);
-		((InternetAddressMailbox *) mailbox)->addr = addr->str;
-		
-		if (name)
-			_internet_address_set_name (mailbox, name->str);
-	}
-	
-	g_string_free (addr, mailbox ? FALSE : TRUE);
-	if (name)
-		g_string_free (name, TRUE);
-	
-	return mailbox;
-}
-
-static InternetAddress *
-decode_address (const char **in)
-{
-	InternetAddressGroup *group;
-	InternetAddress *addr = NULL;
-	const char *inptr, *start;
-	const char *word;
-	GString *name;
-	
-	decode_lwsp (in);
-	start = inptr = *in;
-	
-	/* pre-scan */
-	name = g_string_new ("");
-	word = decode_word (&inptr);
-	
-	while (word) {
-		g_string_append_len (name, word, (size_t) (inptr - word));
-		if ((word = decode_word (&inptr)))
-			g_string_append_c (name, ' ');
-	}
-	
-	decode_lwsp (&inptr);
-	if (*inptr == ':') {
-		addr = internet_address_group_new (name->str);
-		group = (InternetAddressGroup *) addr;
-		inptr++;
-		
-		decode_lwsp (&inptr);
-		while (*inptr && *inptr != ';') {
-			InternetAddress *member;
-			
-			if ((member = decode_mailbox (&inptr)))
+			decode_lwsp (&inptr);
+			if ((member = decode_address (&inptr)))
 				_internet_address_group_add_member (group, member);
 			
 			decode_lwsp (&inptr);
-			while (*inptr == ',') {
+		}
+	}
+	
+	*in = inptr;
+	
+	return addr;
+}
+
+static InternetAddress *
+decode_address (const char **in)
+{
+	const char *inptr, *start, *word, *comment = NULL;
+	InternetAddress *addr = NULL;
+	gboolean has_lwsp = FALSE;
+	gboolean is_word;
+	GString *name;
+	
+	decode_lwsp (in);
+	start = inptr = *in;
+	
+	name = g_string_new ("");
+	
+	/**
+	 * Both groups and mailboxes can begin with a phrase (denoting
+	 * the display name for the address). Collect all of the
+	 * tokens that make up this name phrase.
+	 **/
+	while (*inptr) {
+		if ((word = decode_word (&inptr))) {
+			g_string_append_len (name, word, (size_t) (inptr - word));
+			
+		check_lwsp:
+			word = inptr;
+			skip_lwsp (&inptr);
+			
+			/* is the next token a word token? */
+			is_word = *inptr == '"' || is_atom (*inptr);
+			
+			if (inptr > word && is_word) {
+				g_string_append_c (name, ' ');
+				has_lwsp = TRUE;
+			}
+			
+			if (is_word)
+				continue;
+		}
+		
+		/**
+		 * specials    =  "(" / ")" / "<" / ">" / "@"  ; Must be in quoted-
+		 *             /  "," / ";" / ":" / "\" / <">  ;  string, to use
+		 *             /  "." / "[" / "]"              ;  within a word.
+		 **/
+		if (*inptr == ':') {
+			/* group */
+			inptr++;
+			addr = decode_group (&inptr);
+			decode_lwsp (&inptr);
+			if (*inptr != ';')
+				w(g_warning ("Invalid group spec, missing closing ';': %.*s",
+					     inptr - start, start));
+			else
 				inptr++;
-				decode_lwsp (&inptr);
-				if ((member = decode_mailbox (&inptr)))
-					_internet_address_group_add_member (group, member);
+			break;
+		} else if (*inptr == '<') {
+			/* mailbox route-addr */
+			inptr++;
+			addr = decode_addrspec (&inptr);
+			decode_lwsp (&inptr);
+			if (*inptr != '>') {
+				w(g_warning ("Invalid route-addr, missing closing '>': %.*s",
+					     inptr - start, start));
 				
-				decode_lwsp (&inptr);
+				while (*inptr && *inptr != '>' && *inptr != ',')
+					inptr++;
+				
+				if (*inptr == '>')
+					inptr++;
+			} else
+				inptr++;
+			
+			/* if comment is non-NULL, we can check for a comment containing a name */
+			comment = inptr;
+			break;
+		} else if (*inptr == '(') {
+			/* beginning of a comment, use decode_lwsp() to skip past it */
+			decode_lwsp (&inptr);
+		} else if (*inptr && strchr ("@,;", *inptr)) {
+			if (name->len == 0) {
+				if (*inptr == '@') {
+					GString *domain;
+					
+					w(g_warning ("Unexpected address: %s: skipping.", start));
+					
+					/* skip over @domain? */
+					inptr++;
+					domain = g_string_new ("");
+					decode_domain (&inptr, domain);
+					g_string_free (domain, TRUE);
+				} else {
+					/* empty address */
+				}
+				break;
+			} else if (has_lwsp) {
+				/* assume this is just an unquoted special that we should
+				   treat as part of the name */
+				w(g_warning ("Unquoted '%c' in address name: %s: ignoring.", *inptr, start));
+				g_string_append_c (name, *inptr);
+				inptr++;
+				
+				goto check_lwsp;
 			}
+			
+		addrspec:
+			/* what we thought was a name was actually an addrspec? */
+			g_string_truncate (name, 0);
+			inptr = start;
+			
+			addr = decode_addrspec (&inptr);
+			
+			/* if comment is non-NULL, we can check for a comment containing a name */
+			comment = inptr;
+			break;
+		} else if (*inptr == '.') {
+			/* This would normally signify that we are
+			 * decoding the local-part of an addr-spec,
+			 * but sadly, it is common for broken mailers
+			 * to forget to quote/encode .'s in the name
+			 * phrase. */
+			g_string_append_c (name, *inptr);
+			inptr++;
+			
+			goto check_lwsp;
+		} else if (*inptr) {
+			/* Technically, these are all invalid tokens
+			 * but in the interest of being liberal in
+			 * what we accept, we'll ignore them. */
+			w(g_warning ("Unexpected char '%c' in address: %s: ignoring.", *inptr, start));
+			g_string_append_c (name, *inptr);
+			inptr++;
+			
+			goto check_lwsp;
+		} else {
+			goto addrspec;
 		}
-		
-		if (*inptr == ';')
-			inptr++;
-		else
-			w(g_warning ("Invalid group spec, missing closing ';': %.*s",
-				     inptr - start, start));
-		
-		*in = inptr;
-	} else {
-		/* this is a mailbox */
-		addr = decode_mailbox (in);
-	}
+	}
+	
+	/* Note: will also skip over any comments */
+	decode_lwsp (&inptr);
+	
+	if (name->len == 0 && comment && inptr > comment) {
+		/* missing a name, look for a trailing comment */
+		if ((comment = memchr (comment, '(', inptr - comment))) {
+			const char *cend;
+			
+			/* find the end of the comment */
+			cend = inptr - 1;
+			while (cend > comment && is_lwsp (*cend))
+				cend--;
+			
+			if (*cend == ')')
+				cend--;
+			
+			g_string_append_len (name, comment + 1, (size_t) (cend - comment));
+		}
+	}
+	
+	if (addr && name->len > 0)
+		_internet_address_decode_name (addr, name);
 	
 	g_string_free (name, TRUE);
+	
+	*in = inptr;
 	
 	return addr;
 }
@@ -1619,9 +1697,9 @@
 		}
 		
 		decode_lwsp (&inptr);
-		if (*inptr == ',')
+		if (*inptr == ',') {
 			inptr++;
-		else if (*inptr) {
+		} else if (*inptr) {
 			w(g_warning ("Parse error at '%s': expected ','", inptr));
 			/* try skipping to the next address */
 			if ((inptr = strchr (inptr, ',')))

Modified: packages/unstable/gmime2.4/gmime/internet-address.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/internet-address.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/internet-address.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/internet-address.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/iconv-detect.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/iconv-detect.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/iconv-detect.c [utf-8] (original)
+++ packages/unstable/gmime2.4/iconv-detect.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 1999-2009 Jeffrey Stedfast
+ *  Copyright (C) 1999-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/src/uudecode.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/src/uudecode.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/src/uudecode.c [utf-8] (original)
+++ packages/unstable/gmime2.4/src/uudecode.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 #endif
 #include <fcntl.h>
 #include <errno.h>
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (__MINGW32__)
 #include <io.h>
 typedef int mode_t;
 #endif

Modified: packages/unstable/gmime2.4/src/uuencode.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/src/uuencode.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/src/uuencode.c [utf-8] (original)
+++ packages/unstable/gmime2.4/src/uuencode.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/Makefile.am?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/Makefile.am [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/Makefile.am [utf-8] Mon Mar 14 20:31:22 2011
@@ -22,9 +22,13 @@
 	test-cat	\
 	test-headers	\
 	test-mbox	\
-	test-mime	\
+	test-mime
+
+if ENABLE_CRYPTOGRAPHY
+AUTOMATED_TESTS +=	\
 	test-pgp	\
 	test-pgpmime
+endif
 
 MANUAL_TESTS =		\
 	test-best	\
@@ -87,6 +91,7 @@
 test_partial_DEPENDENCIES = $(DEPS)
 test_partial_LDADD = $(LDADDS)
 
+if ENABLE_CRYPTOGRAPHY
 test_pgp_SOURCES = test-pgp.c testsuite.c testsuite.h
 test_pgp_LDFLAGS = 
 test_pgp_DEPENDENCIES = $(DEPS)
@@ -96,6 +101,7 @@
 test_pgpmime_LDFLAGS = 
 test_pgpmime_DEPENDENCIES = $(DEPS)
 test_pgpmime_LDADD = $(LDADDS)
+endif
 
 EXTRA_DIST = test1.eml test2.eml test3.eml
 

Modified: packages/unstable/gmime2.4/tests/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/Makefile.in?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/Makefile.in [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/Makefile.in [utf-8] Mon Mar 14 20:31:22 2011
@@ -34,7 +34,11 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+ at ENABLE_CRYPTOGRAPHY_TRUE@am__append_1 = \
+ at ENABLE_CRYPTOGRAPHY_TRUE@	test-pgp	\
+ at ENABLE_CRYPTOGRAPHY_TRUE@	test-pgpmime
+
+noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -46,10 +50,12 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = test-iconv$(EXEEXT) test-streams$(EXEEXT) \
+ at ENABLE_CRYPTOGRAPHY_TRUE@am__EXEEXT_1 = test-pgp$(EXEEXT) \
+ at ENABLE_CRYPTOGRAPHY_TRUE@	test-pgpmime$(EXEEXT)
+am__EXEEXT_2 = test-iconv$(EXEEXT) test-streams$(EXEEXT) \
 	test-cat$(EXEEXT) test-headers$(EXEEXT) test-mbox$(EXEEXT) \
-	test-mime$(EXEEXT) test-pgp$(EXEEXT) test-pgpmime$(EXEEXT)
-am__EXEEXT_2 = test-best$(EXEEXT) test-parser$(EXEEXT) \
+	test-mime$(EXEEXT) $(am__EXEEXT_1)
+am__EXEEXT_3 = test-best$(EXEEXT) test-parser$(EXEEXT) \
 	test-html$(EXEEXT) test-partial$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am_test_best_OBJECTS = test-best.$(OBJEXT)
@@ -100,12 +106,17 @@
 test_partial_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(test_partial_LDFLAGS) $(LDFLAGS) -o $@
-am_test_pgp_OBJECTS = test-pgp.$(OBJEXT) testsuite.$(OBJEXT)
+am__test_pgp_SOURCES_DIST = test-pgp.c testsuite.c testsuite.h
+ at ENABLE_CRYPTOGRAPHY_TRUE@am_test_pgp_OBJECTS = test-pgp.$(OBJEXT) \
+ at ENABLE_CRYPTOGRAPHY_TRUE@	testsuite.$(OBJEXT)
 test_pgp_OBJECTS = $(am_test_pgp_OBJECTS)
 test_pgp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(test_pgp_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_test_pgpmime_OBJECTS = test-pgpmime.$(OBJEXT) testsuite.$(OBJEXT)
+am__test_pgpmime_SOURCES_DIST = test-pgpmime.c testsuite.c testsuite.h
+ at ENABLE_CRYPTOGRAPHY_TRUE@am_test_pgpmime_OBJECTS =  \
+ at ENABLE_CRYPTOGRAPHY_TRUE@	test-pgpmime.$(OBJEXT) \
+ at ENABLE_CRYPTOGRAPHY_TRUE@	testsuite.$(OBJEXT)
 test_pgpmime_OBJECTS = $(am_test_pgpmime_OBJECTS)
 test_pgpmime_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -135,8 +146,8 @@
 	$(test_headers_SOURCES) $(test_html_SOURCES) \
 	$(test_iconv_SOURCES) $(test_mbox_SOURCES) \
 	$(test_mime_SOURCES) $(test_parser_SOURCES) \
-	$(test_partial_SOURCES) $(test_pgp_SOURCES) \
-	$(test_pgpmime_SOURCES) $(test_streams_SOURCES)
+	$(test_partial_SOURCES) $(am__test_pgp_SOURCES_DIST) \
+	$(am__test_pgpmime_SOURCES_DIST) $(test_streams_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -342,16 +353,8 @@
 		-DGMIME_MINOR_VERSION=$(GMIME_MINOR_VERSION)	\
 		-DGMIME_MICRO_VERSION=$(GMIME_MICRO_VERSION)
 
-AUTOMATED_TESTS = \
-	test-iconv	\
-	test-streams	\
-	test-cat	\
-	test-headers	\
-	test-mbox	\
-	test-mime	\
-	test-pgp	\
-	test-pgpmime
-
+AUTOMATED_TESTS = test-iconv test-streams test-cat test-headers \
+	test-mbox test-mime $(am__append_1)
 MANUAL_TESTS = \
 	test-best	\
 	test-parser 	\
@@ -400,14 +403,14 @@
 test_partial_LDFLAGS = 
 test_partial_DEPENDENCIES = $(DEPS)
 test_partial_LDADD = $(LDADDS)
-test_pgp_SOURCES = test-pgp.c testsuite.c testsuite.h
-test_pgp_LDFLAGS = 
-test_pgp_DEPENDENCIES = $(DEPS)
-test_pgp_LDADD = $(LDADDS)
-test_pgpmime_SOURCES = test-pgpmime.c testsuite.c testsuite.h
-test_pgpmime_LDFLAGS = 
-test_pgpmime_DEPENDENCIES = $(DEPS)
-test_pgpmime_LDADD = $(LDADDS)
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgp_SOURCES = test-pgp.c testsuite.c testsuite.h
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgp_LDFLAGS = 
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgp_DEPENDENCIES = $(DEPS)
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgp_LDADD = $(LDADDS)
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgpmime_SOURCES = test-pgpmime.c testsuite.c testsuite.h
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgpmime_LDFLAGS = 
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgpmime_DEPENDENCIES = $(DEPS)
+ at ENABLE_CRYPTOGRAPHY_TRUE@test_pgpmime_LDADD = $(LDADDS)
 EXTRA_DIST = test1.eml test2.eml test3.eml
 VERBOSITY = -v
 all: all-recursive

Modified: packages/unstable/gmime2.4/tests/test-best.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-best.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-best.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-best.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-cat.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-cat.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-cat.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-cat.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-headers.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-headers.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-headers.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-headers.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-html.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-html.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-html.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-html.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-iconv.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-iconv.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-iconv.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-iconv.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-mbox.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-mbox.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-mbox.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-mbox.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-mime.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-mime.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-mime.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-mime.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -78,6 +78,9 @@
 	{ "Jeffrey \"fejj\" Stedfast <fejj at helixcode.com>",
 	  "Jeffrey fejj Stedfast <fejj at helixcode.com>",
 	  "Jeffrey fejj Stedfast <fejj at helixcode.com>" },
+	{ "\"Jeffrey \\\"fejj\\\" Stedfast\" <fejj at helixcode.com>",
+	  "Jeffrey \"fejj\" Stedfast <fejj at helixcode.com>",
+	  "\"Jeffrey \\\"fejj\\\" Stedfast\" <fejj at helixcode.com>" },
 	{ "\"Stedfast, Jeffrey\" <fejj at helixcode.com>",
 	  "\"Stedfast, Jeffrey\" <fejj at helixcode.com>",
 	  "\"Stedfast, Jeffrey\" <fejj at helixcode.com>" },
@@ -166,10 +169,45 @@
 	{ "Canonical Patch Queue Manager<pqm at pqm.ubuntu.com>",
 	  "Canonical Patch Queue Manager <pqm at pqm.ubuntu.com>",
 	  "Canonical Patch Queue Manager <pqm at pqm.ubuntu.com>" },
+	/* Some examples pulled from rfc5322 */
+	{ "Pete(A nice \\) chap) <pete(his account)@silly.test(his host)>",
+	  "Pete <pete at silly.test>",
+	  "Pete <pete at silly.test>" },
+	{ "A Group(Some people):Chris Jones <c@(Chris's host.)public.example>, joe at example.org, John <jdoe at one.test> (my dear friend); (the end of the group)",
+	  "A Group: Chris Jones <c at public.example>, joe at example.org, John <jdoe at one.test>;",
+	  "A Group: Chris Jones <c at public.example>, joe at example.org, John <jdoe at one.test>;" },
+	/* The following tests cases are meant to test forgivingness
+	 * of the parser when it encounters unquoted specials in the
+	 * name component */
+	{ "Warren Worthington, Jr. <warren at worthington.com>",
+	  "\"Warren Worthington, Jr.\" <warren at worthington.com>",
+	  "\"Warren Worthington, Jr.\" <warren at worthington.com>" },
+	{ "dot.com <dot.com>",
+	  "\"dot.com\" <dot.com>",
+	  "\"dot.com\" <dot.com>" },
+	{ "=?UTF-8?Q?agatest123_\"test\"?= <agatest123 at o2.pl>",
+	  "agatest123 test <agatest123 at o2.pl>",
+	  "agatest123 test <agatest123 at o2.pl>" },
+	{ "\"=?ISO-8859-2?Q?TEST?=\" <p at p.org>",
+	  "TEST <p at p.org>",
+	  "TEST <p at p.org>" },
+	{ "sdfasf at wp.pl,c tert at wp.pl,sffdg.rtre at op.pl",
+	  "sdfasf at wp.pl, c, sffdg.rtre at op.pl",
+	  "sdfasf at wp.pl, c, sffdg.rtre at op.pl" },
+};
+
+static struct {
+	const char *input;
+	const char *display;
+	const char *encoded;
+} broken_addrspec[] = {
+	{ "\"Biznes=?ISO-8859-2?Q?_?=INTERIA.PL\"=?ISO-8859-2?Q?_?=<biuletyny at firma.interia.pl>",
+	  "\"Biznes INTERIA.PL \" <biuletyny at firma.interia.pl>",
+	  "\"Biznes INTERIA.PL\" <biuletyny at firma.interia.pl>", },
 };
 
 static void
-test_addrspec (void)
+test_addrspec (gboolean test_broken)
 {
 	InternetAddressList *addrlist;
 	char *str;
@@ -186,12 +224,12 @@
 			
 			str = internet_address_list_to_string (addrlist, FALSE);
 			if (strcmp (addrspec[i].display, str) != 0)
-				throw (exception_new ("display addr-spec does not match: %s", str));
+				throw (exception_new ("display addr-spec %s does not match: %s", addrspec[i].display, str));
 			g_free (str);
 			
 			str = internet_address_list_to_string (addrlist, TRUE);
 			if (strcmp (addrspec[i].encoded, str) != 0)
-				throw (exception_new ("encoded addr-spec does not match: %s", str));
+				throw (exception_new ("encoded addr-spec %s does not match: %s", addrspec[i].encoded, str));
 			
 			testsuite_check_passed ();
 		} catch (ex) {
@@ -201,6 +239,36 @@
 		g_free (str);
 		if (addrlist)
 			g_object_unref (addrlist);
+	}
+	
+	if (test_broken) {
+		for (i = 0; i < G_N_ELEMENTS (broken_addrspec); i++) {
+			addrlist = NULL;
+			str = NULL;
+			
+			testsuite_check ("broken_addrspec[%u]", i);
+			try {
+				if (!(addrlist = internet_address_list_parse_string (broken_addrspec[i].input)))
+					throw (exception_new ("could not parse addr-spec"));
+				
+				str = internet_address_list_to_string (addrlist, FALSE);
+				if (strcmp (broken_addrspec[i].display, str) != 0)
+					throw (exception_new ("display addr-spec %s does not match: %s", broken_addrspec[i].display, str));
+				g_free (str);
+				
+				str = internet_address_list_to_string (addrlist, TRUE);
+				if (strcmp (broken_addrspec[i].encoded, str) != 0)
+					throw (exception_new ("encoded addr-spec %s does not match: %s", broken_addrspec[i].encoded, str));
+				
+				testsuite_check_passed ();
+			} catch (ex) {
+				testsuite_check_failed ("broken_addrspec[%u]: %s", i, ex->message);
+			} finally;
+			
+			g_free (str);
+			if (addrlist)
+				g_object_unref (addrlist);
+		}
 	}
 }
 
@@ -525,7 +593,7 @@
 	testsuite_init (argc, argv);
 	
 	testsuite_start ("addr-spec parser");
-	test_addrspec ();
+	test_addrspec (FALSE);
 	testsuite_end ();
 	
 	testsuite_start ("date parser");
@@ -548,6 +616,7 @@
 	
 	g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
 	testsuite_start ("broken rfc2047 encoding/decoding");
+	test_addrspec (TRUE);
 	test_rfc2047 (TRUE);
 	testsuite_end ();
 	g_mime_shutdown ();

Modified: packages/unstable/gmime2.4/tests/test-parser.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-parser.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-parser.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-parser.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 
 #include <gmime/gmime.h>
 
-#ifndef G_OS_WIN32
+#if !defined (G_OS_WIN32) || defined (__MINGW32__)
 #define ENABLE_ZENTIMER
 #include "zentimer.h"
 #endif

Modified: packages/unstable/gmime2.4/tests/test-partial.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-partial.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-partial.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-partial.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-pgp.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-pgp.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-pgp.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-pgp.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-pgpmime.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-pgpmime.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-pgpmime.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-pgpmime.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/test-streams.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-streams.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-streams.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-streams.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,7 +29,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
+#endif
 #include <unistd.h>
 #include <dirent.h>
 #include <fcntl.h>
@@ -53,7 +55,7 @@
 	size_t nread, size;
 	ssize_t n;
 	
-	v(fprintf (stdout, "Matching original stream (%lld -> %lld) with %s (%lld, %lld)... ",
+	v(fprintf (stdout, "Matching original stream (%" G_GINT64_FORMAT " -> %" G_GINT64_FORMAT ") with %s (%" G_GINT64_FORMAT ", %" G_GINT64_FORMAT ")... ",
 		   streams[0]->position, streams[0]->bound_end, filename,
 		   streams[1]->position, streams[1]->bound_end));
 	
@@ -77,19 +79,19 @@
 		nread = 0;
 		totalread += n;
 		
-		d(fprintf (stderr, "read %zu bytes from stream[0]\n", size));
+		d(fprintf (stderr, "read %" G_GSIZE_FORMAT " bytes from stream[0]\n", size));
 		
 		do {
 			if ((n = g_mime_stream_read (streams[1], dbuf + nread, size - nread)) <= 0) {
-				d(fprintf (stderr, "stream[1] read() returned %zd, EOF\n", n));
+				d(fprintf (stderr, "stream[1] read() returned %" G_GSSIZE_FORMAT ", EOF\n", n));
 				break;
 			}
-			d(fprintf (stderr, "read %zd bytes from stream[1]\n", n));
+			d(fprintf (stderr, "read %" G_GSSIZE_FORMAT " bytes from stream[1]\n", n));
 			nread += n;
 		} while (nread < size);
 		
 		if (nread < size) {
-			sprintf (errstr, "Error: `%s' appears to be truncated, short %zu+ bytes\n",
+			sprintf (errstr, "Error: `%s' appears to be truncated, short %" G_GSIZE_FORMAT "+ bytes\n",
 				 filename, size - nread);
 			goto fail;
 		}
@@ -98,7 +100,7 @@
 			sprintf (errstr, "Error: `%s': content does not match\n", filename);
 			goto fail;
 		} else {
-			d(fprintf (stderr, "%zu bytes identical\n", size));
+			d(fprintf (stderr, "%" G_GSIZE_FORMAT " bytes identical\n", size));
 		}
 	}
 	
@@ -130,8 +132,11 @@
 	char sbuf[100], rbuf[100];
 	ssize_t slen;
 	FILE *fp;
-	
-	if (!(fp = fopen (filename, "r+")))
+
+	/* '0x1a' character is treated as EOF (Ctrl+Z) on Windows if file is opened in text mode,
+	 *  thus it's opened in binary mode.
+	 */
+	if (!(fp = fopen (filename, "r+b")))
 		throw (exception_new ("could not open `%s': %s", filename, g_strerror (errno)));
 	
 	while (!g_mime_stream_eos (stream)) {
@@ -146,8 +151,8 @@
 	fclose (fp);
 	
 	if (strcmp (sbuf, rbuf) != 0) {
-		v(fprintf (stderr, "\tstream: \"%s\" (%zu)\n", sbuf, strlen (sbuf)));
-		v(fprintf (stderr, "\treal:   \"%s\" (%zu)\n", rbuf, strlen (rbuf)));
+		v(fprintf (stderr, "\tstream: \"%s\" (%" G_GSIZE_FORMAT ")\n", sbuf, strlen (sbuf)));
+		v(fprintf (stderr, "\treal:   \"%s\" (%" G_GSIZE_FORMAT ")\n", rbuf, strlen (rbuf)));
 		throw (exception_new ("streams did not match"));
 	}
 }
@@ -305,6 +310,7 @@
 	return TRUE;
 }
 
+#ifdef HAVE_SYS_MMAN_H
 static gboolean
 check_stream_mmap (const char *input, const char *output, const char *filename, gint64 start, gint64 end)
 {
@@ -337,6 +343,7 @@
 	
 	return TRUE;
 }
+#endif
 
 static gboolean
 check_stream_buffer_block (const char *input, const char *output, const char *filename, gint64 start, gint64 end)
@@ -417,7 +424,9 @@
 } checks[] = {
 	{ "GMimeStreamFs",                  check_stream_fs           },
 	{ "GMimeStreamFile",                check_stream_file         },
+#ifdef HAVE_SYS_MMAN_H
 	{ "GMimeStreamMmap",                check_stream_mmap         },
+#endif
 	{ "GMimeStreamBuffer (block mode)", check_stream_buffer_block },
 	{ "GMimeStreamBuffer (cache mode)", check_stream_buffer_cache },
 };
@@ -446,7 +455,7 @@
 	n = strlen (filename);
 	
 	while ((dent = readdir (dir))) {
-		if (strncmp (dent->d_name, filename, n) != 0 || dent->d_name[n] != ':')
+		if (strncmp (dent->d_name, filename, n) != 0 || dent->d_name[n] != '_')
 			continue;
 		
 		p = dent->d_name + n + 1;
@@ -480,7 +489,7 @@
 }
 
 
-static void
+static size_t
 gen_random_stream (GMimeStream *stream)
 {
 	size_t nwritten, buflen, total = 0, size, i;
@@ -489,7 +498,7 @@
 	
 	/* read between 4k and 14k bytes */
 	size = 4096 + (size_t) (10240.0 * (rand () / (RAND_MAX + 1.0)));
-	v(fprintf (stdout, "Generating %zu bytes of random data... ", size));
+	v(fprintf (stdout, "Generating %" G_GSIZE_FORMAT " bytes of random data... ", size));
 	v(fflush (stdout));
 	
 	while (total < size) {
@@ -513,6 +522,8 @@
 	g_mime_stream_reset (stream);
 	
 	v(fputs ("done\n", stdout));
+
+	return size;
 }
 
 static int
@@ -520,9 +531,7 @@
 {
 	GMimeStream *istream, *ostream, *stream;
 	char input[256], output[256], *name, *p;
-	gint64 start, end;
-	struct stat st;
-	size_t len;
+	gint64 start, end, len, size;
 	int fd, i;
 	
 	srand (time (NULL));
@@ -541,36 +550,30 @@
 	*name++ = G_DIR_SEPARATOR;
 	strcpy (name, "streamXXXXXX");
 	
-	if ((fd = mkstemp (input)) == -1)
+	if ((fd = g_mkstemp (input)) == -1)
 		return -1;
 	
 	*stream_name = g_strdup (name);
 	
 	*p++ = G_DIR_SEPARATOR;
 	p = g_stpcpy (p, name);
-	*p++ = ':';
+	*p++ = '_';
 	
 	istream = g_mime_stream_fs_new (fd);
-	gen_random_stream (istream);
-	
-	if (stat (input, &st) == -1 || !S_ISREG (st.st_mode)) {
-		g_object_unref (istream);
-		unlink (input);
-		return -1;
-	}
+	size = gen_random_stream (istream);
 	
 	for (i = 0; i < 64; i++) {
 	retry:
-		start = (gint64) (st.st_size * (rand () / (RAND_MAX + 1.0)));
-		len = (size_t) (st.st_size * (rand () / (RAND_MAX + 1.0)));
-		if (start + len > st.st_size) {
-			len = st.st_size - start;
+		start = (gint64) (size * (rand () / (RAND_MAX + 1.0)));
+		len = (gint64) (size * (rand () / (RAND_MAX + 1.0)));
+		if (start + len > size) {
+			len = size - start;
 			end = -1;
 		} else {
 			end = start + len;
 		}
 		
-		sprintf (p, "%lld,%lld", start, end);
+		sprintf (p, "%" G_GINT64_FORMAT ",%" G_GINT64_FORMAT, start, end);
 		
 		if ((fd = open (output, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) == -1)
 			goto retry;

Modified: packages/unstable/gmime2.4/tests/testsuite.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/testsuite.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/testsuite.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/testsuite.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/tests/testsuite.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/testsuite.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/testsuite.h [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/testsuite.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: packages/unstable/gmime2.4/util/cache.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/cache.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/cache.c [utf-8] (original)
+++ packages/unstable/gmime2.4/util/cache.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/util/cache.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/cache.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/cache.h [utf-8] (original)
+++ packages/unstable/gmime2.4/util/cache.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/util/gtrie.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/gtrie.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/gtrie.c [utf-8] (original)
+++ packages/unstable/gmime2.4/util/gtrie.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/util/gtrie.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/gtrie.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/gtrie.h [utf-8] (original)
+++ packages/unstable/gmime2.4/util/gtrie.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/util/list.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/list.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/list.c [utf-8] (original)
+++ packages/unstable/gmime2.4/util/list.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/util/list.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/list.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/list.h [utf-8] (original)
+++ packages/unstable/gmime2.4/util/list.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/util/url-scanner.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/url-scanner.c?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/url-scanner.c [utf-8] (original)
+++ packages/unstable/gmime2.4/util/url-scanner.c [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/util/url-scanner.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/util/url-scanner.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/util/url-scanner.h [utf-8] (original)
+++ packages/unstable/gmime2.4/util/url-scanner.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  GMime
- *  Copyright (C) 2000-2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License

Modified: packages/unstable/gmime2.4/zentimer.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/zentimer.h?rev=26878&op=diff
==============================================================================
--- packages/unstable/gmime2.4/zentimer.h [utf-8] (original)
+++ packages/unstable/gmime2.4/zentimer.h [utf-8] Mon Mar 14 20:31:22 2011
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*  ZenTimer
- *  Copyright (C) 2009 Jeffrey Stedfast
+ *  Copyright (C) 2000-2010 Jeffrey Stedfast
  *
  *  Permission is hereby granted, free of charge, to any person
  *  obtaining a copy of this software and associated documentation




More information about the pkg-gnome-commits mailing list