From abba9373525dbfa8fb8dfcb0505e7ae682357983 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Fri, 2 Mar 2001 11:30:11 +0000 Subject: [PATCH] Updated the charset conversion library to UniCode 3.0. Removed ice age relics. Removed signature tables as they are not used anyway. --- charset/Makefile | 20 +- charset/U-cat.h | 163 +++++++------- charset/U-lower.h | 47 ++-- charset/U-sig.h | 172 --------------- charset/U-unacc.h | 52 ++--- charset/U-upper.h | 42 ++-- charset/chartable.h | 358 +++++++++++++++++++++++++++---- charset/misc/chartable.in | 6 +- charset/misc/cstocs-names | 252 ---------------------- charset/misc/enc2table | 29 --- charset/misc/generate | 14 ++ charset/misc/mksig | 40 ---- charset/misc/mkunacc | 5 +- charset/misc/tabgen | 2 +- charset/misc/{gentab => table2h} | 0 charset/misc/unisplit | 7 +- charset/tosig.c | 9 - charset/unicode.h | 10 +- 18 files changed, 499 insertions(+), 729 deletions(-) delete mode 100644 charset/U-sig.h delete mode 100644 charset/misc/cstocs-names delete mode 100644 charset/misc/enc2table create mode 100644 charset/misc/generate delete mode 100644 charset/misc/mksig rename charset/misc/{gentab => table2h} (100%) mode change 100644 => 100755 delete mode 100644 charset/tosig.c diff --git a/charset/Makefile b/charset/Makefile index 6c3d1c38..6454e26f 100644 --- a/charset/Makefile +++ b/charset/Makefile @@ -1,22 +1,14 @@ -# Makefile for the Sherlock Charset Library (c) 1997--2000 Martin Mares +# Makefile for the Sherlock Charset Library (c) 1997--2001 Martin Mares DIRS+=charset -UNI_OBJS=toupper.o tolower.o tocat.o utf8.o unaccent.o tosig.o strlen.o debug.o \ +UNI_OBJS=toupper.o tolower.o tocat.o utf8.o unaccent.o strlen.o debug.o \ charconv.o setnames.o obj/charset/libcharset.a: $(addprefix obj/charset/,$(UNI_OBJS)) -build_charsets: clean_charsets - misc/unisplit - misc/gentab _U_cat byte U-cat.h - misc/gentab _U_lower word U-lower.h - misc/gentab _U_upper word U-upper.h - misc/mkunacc >misc/u-unacc - misc/gentab _U_unaccent word U-unacc.h - misc/mksig >misc/u-sig - misc/gentab _U_sig byte U-sig.h - misc/tabgen chartable.h +build_charsets: + cd charset && sh misc/generate -clean_charsets: - rm -f misc/u-* U-*.h chartable.h +clean:: + rm -f charset/misc/u-* diff --git a/charset/U-cat.h b/charset/U-cat.h index ddd9bcd1..f4d65db5 100644 --- a/charset/U-cat.h +++ b/charset/U-cat.h @@ -30,26 +30,26 @@ _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_LOWER, _C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER, _C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER, -_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,0,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER, -_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,0,_C_UPPER,_C_LOWER,0,0, +_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER, +_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,0,_C_UPPER,_C_LOWER,_C_LOWER,_C_LOWER, 0,0,0,0,_C_UPPER,0,_C_LOWER,_C_UPPER,0,_C_LOWER,_C_UPPER,0,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER, _C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_LOWER,_C_UPPER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, -_C_LOWER,_C_UPPER,0,_C_LOWER,_C_UPPER,_C_LOWER,0,0,0,0,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER +_C_LOWER,_C_UPPER,0,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER }; static byte _U_cat_02[256] = { _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, -_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, +0,0,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, +_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0,0, +_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -71,27 +71,27 @@ _C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER _C_UPPER,_C_UPPER,0,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0, -_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,0,0,0,_C_UPPER,0,_C_UPPER,0,_C_UPPER,0, -_C_UPPER,0,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, -_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0,0,0,0,0,0,0,0 +_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, +_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, +_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0,0,0,0,0,0,0 }; static byte _U_cat_04[256] = { -0,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,_C_UPPER,_C_UPPER, _C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, _C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, +_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, +_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, -0,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_LOWER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, -_C_UPPER,_C_LOWER,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +_C_UPPER,_C_LOWER,0,0,0,0,0,0,0,0,0,0,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, -0,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,0,0,_C_UPPER,_C_LOWER,0,0,_C_UPPER,_C_LOWER,0,0,0, +_C_UPPER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,0,0,_C_UPPER,_C_LOWER,0,0,_C_UPPER,_C_LOWER,0,0,0, +_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER, -_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,0,0,_C_UPPER,_C_LOWER, _C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_LOWER,0,0,_C_UPPER,_C_LOWER,0,0,0,0,0,0 }; @@ -114,6 +114,25 @@ _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; +static byte _U_cat_07[256] = { +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_C_CTRL, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +}; + static byte _U_cat_10[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -128,9 +147,47 @@ static byte _U_cat_10[256] = { _C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, _C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, _C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,0,0,0,0,0,0,0,0, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +}; + +static byte _U_cat_16[256] = { +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +_C_BLANK,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +}; + +static byte _U_cat_18[256] = { +0,0,0,0,0,0,0,0,0,0,0,_C_CTRL,_C_CTRL,_C_CTRL,_C_CTRL,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static byte _U_cat_1E[256] = { @@ -161,20 +218,20 @@ _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,_C_UPPER,_C_UPPER,_C_U _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_UPPER,0,_C_UPPER,0,_C_UPPER,0,_C_UPPER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,_C_UPPER,0, -0,0,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,0, +_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0,0,0, +_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0,0,0, +_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0,0,0, +_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,_C_LOWER,0, +0,0,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,0,0, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,0,0, _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,0, -0,0,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,0 +0,0,_C_LOWER,_C_LOWER,_C_LOWER,0,_C_LOWER,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0,0,0 }; static byte _U_cat_20[256] = { _C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_CTRL,_C_CTRL,_C_CTRL,_C_CTRL, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,_C_BLANK,_C_BLANK,_C_CTRL,_C_CTRL,_C_CTRL,_C_CTRL,_C_CTRL,0, +0,0,0,0,0,0,0,0,_C_BLANK,_C_BLANK,_C_CTRL,_C_CTRL,_C_CTRL,_C_CTRL,_C_CTRL,_C_BLANK, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -192,13 +249,9 @@ _C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK,_C_BLANK static byte _U_cat_21[256] = { 0,0,_C_UPPER,0,0,0,0,_C_UPPER,0,0,_C_LOWER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER, -_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,0,_C_UPPER,0,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0, -_C_UPPER,_C_UPPER,_C_UPPER,0,_C_UPPER,0,_C_UPPER,0,_C_UPPER,0,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER, -_C_UPPER,_C_UPPER,0,_C_UPPER,_C_LOWER,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,0,_C_UPPER,0,0,0,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,0, +0,0,0,0,_C_UPPER,0,_C_UPPER,0,_C_UPPER,0,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,0,_C_LOWER, +_C_UPPER,_C_UPPER,0,_C_UPPER,_C_LOWER,0,0,0,0,_C_LOWER,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -206,25 +259,10 @@ _C_UPPER,_C_UPPER,0,_C_UPPER,_C_LOWER,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -static byte _U_cat_24[256] = { -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, -_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER,_C_UPPER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; @@ -247,25 +285,6 @@ _C_BLANK,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static byte _U_cat_33[256] = { -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,_C_LOWER,_C_UPPER,_C_LOWER,0,_C_LOWER,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,_C_UPPER,_C_UPPER,_C_UPPER,_C_LOWER,_C_LOWER,0,0,0,_C_LOWER,_C_LOWER,_C_LOWER, -0,0,0,0,0,0,0,0,0,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,_C_LOWER,0,0, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,0,0,0,0,0,_C_UPPER,0,0,0,0,0,_C_UPPER, -0,_C_UPPER,0,0,_C_LOWER,_C_LOWER,0,0,0,0,_C_LOWER,_C_UPPER,_C_LOWER,_C_UPPER,_C_UPPER,_C_LOWER, -_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_UPPER,0,_C_UPPER,_C_UPPER,_C_LOWER,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - static byte _U_cat_D8[256] = { _C_CTRL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -415,7 +434,7 @@ static byte _U_cat_FE[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_C_BLANK +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_C_CTRL }; static byte _U_cat_FF[256] = { @@ -434,14 +453,14 @@ _C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER,_C_LOWER 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,_C_CTRL,_C_CTRL,_C_CTRL,0,0,0,0 }; byte *_U_cat[256] = { -_U_cat_00,_U_cat_01,_U_cat_02,_U_cat_03,_U_cat_04,_U_cat_05,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, -_U_cat_10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_cat_1E,_U_cat_1F, -_U_cat_20,_U_cat_21,NULL,NULL,_U_cat_24,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, -_U_cat_30,NULL,NULL,_U_cat_33,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, +_U_cat_00,_U_cat_01,_U_cat_02,_U_cat_03,_U_cat_04,_U_cat_05,NULL,_U_cat_07,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, +_U_cat_10,NULL,NULL,NULL,NULL,NULL,_U_cat_16,NULL,_U_cat_18,NULL,NULL,NULL,NULL,NULL,_U_cat_1E,_U_cat_1F, +_U_cat_20,_U_cat_21,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, +_U_cat_30,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,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, diff --git a/charset/U-lower.h b/charset/U-lower.h index d7b34c8f..420a74f2 100644 --- a/charset/U-lower.h +++ b/charset/U-lower.h @@ -28,21 +28,21 @@ static word _U_lower_01[256] = { 0x0151,0,0x0153,0,0x0155,0,0x0157,0,0x0159,0,0x015B,0,0x015D,0,0x015F,0, 0x0161,0,0x0163,0,0x0165,0,0x0167,0,0x0169,0,0x016B,0,0x016D,0,0x016F,0, 0x0171,0,0x0173,0,0x0175,0,0x0177,0,0x00FF,0x017A,0,0x017C,0,0x017E,0,0, -0,0x0253,0x0183,0,0x0185,0,0x0254,0x0188,0,0x0256,0x0257,0x018C,0,0,0x0258,0x0259, -0x025B,0x0192,0,0x0260,0x0263,0,0x0269,0x0268,0x0199,0,0,0,0x026F,0x0272,0,0, -0x01A1,0,0x01A3,0,0x01A5,0,0,0x01A8,0,0x0283,0,0,0x01AD,0,0x0288,0x01B0, +0,0x0253,0x0183,0,0x0185,0,0x0254,0x0188,0,0x0256,0x0257,0x018C,0,0,0x01DD,0x0259, +0x025B,0x0192,0,0x0260,0x0263,0,0x0269,0x0268,0x0199,0,0,0,0x026F,0x0272,0,0x0275, +0x01A1,0,0x01A3,0,0x01A5,0,0x0280,0x01A8,0,0x0283,0,0,0x01AD,0,0x0288,0x01B0, 0,0x028A,0x028B,0x01B4,0,0x01B6,0,0x0292,0x01B9,0,0,0,0x01BD,0,0,0, 0,0,0,0,0x01C6,0x01C6,0,0x01C9,0x01C9,0,0x01CC,0x01CC,0,0x01CE,0,0x01D0, 0,0x01D2,0,0x01D4,0,0x01D6,0,0x01D8,0,0x01DA,0,0x01DC,0,0,0x01DF,0, 0x01E1,0,0x01E3,0,0x01E5,0,0x01E7,0,0x01E9,0,0x01EB,0,0x01ED,0,0x01EF,0, -0,0x01F3,0x01F3,0,0x01F5,0,0,0,0,0,0x01FB,0,0x01FD,0,0x01FF,0 +0,0x01F3,0x01F3,0,0x01F5,0,0x0195,0x01BF,0x01F9,0,0x01FB,0,0x01FD,0,0x01FF,0 }; static word _U_lower_02[256] = { 0x0201,0,0x0203,0,0x0205,0,0x0207,0,0x0209,0,0x020B,0,0x020D,0,0x020F,0, -0x0211,0,0x0213,0,0x0215,0,0x0217,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0x0211,0,0x0213,0,0x0215,0,0x0217,0,0x0219,0,0x021B,0,0x021D,0,0x021F,0, +0,0,0x0223,0,0x0225,0,0x0227,0,0x0229,0,0x022B,0,0x022D,0,0x022F,0, +0x0231,0,0x0233,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -71,13 +71,13 @@ static word _U_lower_03[256] = { 0x03C0,0x03C1,0,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,0x03C9,0x03CA,0x03CB,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0x03E3,0,0x03E5,0,0x03E7,0,0x03E9,0,0x03EB,0,0x03ED,0,0x03EF,0, +0,0,0,0,0,0,0,0,0,0,0x03DB,0,0x03DD,0,0x03DF,0, +0x03E1,0,0x03E3,0,0x03E5,0,0x03E7,0,0x03E9,0,0x03EB,0,0x03ED,0,0x03EF,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static word _U_lower_04[256] = { -0,0x0451,0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459,0x045A,0x045B,0x045C,0,0x045E,0x045F, +0x0450,0x0451,0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459,0x045A,0x045B,0x045C,0x045D,0x045E,0x045F, 0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F, 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -85,13 +85,13 @@ static word _U_lower_04[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x0461,0,0x0463,0,0x0465,0,0x0467,0,0x0469,0,0x046B,0,0x046D,0,0x046F,0, 0x0471,0,0x0473,0,0x0475,0,0x0477,0,0x0479,0,0x047B,0,0x047D,0,0x047F,0, -0x0481,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0x0481,0,0,0,0,0,0,0,0,0,0,0,0x048D,0,0x048F,0, 0x0491,0,0x0493,0,0x0495,0,0x0497,0,0x0499,0,0x049B,0,0x049D,0,0x049F,0, 0x04A1,0,0x04A3,0,0x04A5,0,0x04A7,0,0x04A9,0,0x04AB,0,0x04AD,0,0x04AF,0, 0x04B1,0,0x04B3,0,0x04B5,0,0x04B7,0,0x04B9,0,0x04BB,0,0x04BD,0,0x04BF,0, 0,0x04C2,0,0x04C4,0,0,0,0x04C8,0,0,0,0x04CC,0,0,0,0, 0x04D1,0,0x04D3,0,0x04D5,0,0x04D7,0,0x04D9,0,0x04DB,0,0x04DD,0,0x04DF,0, -0x04E1,0,0x04E3,0,0x04E5,0,0x04E7,0,0x04E9,0,0x04EB,0,0,0,0x04EF,0, +0x04E1,0,0x04E3,0,0x04E5,0,0x04E7,0,0x04E9,0,0x04EB,0,0x04ED,0,0x04EF,0, 0x04F1,0,0x04F3,0,0x04F5,0,0,0,0x04F9,0,0,0,0,0,0,0 }; @@ -114,25 +114,6 @@ static word _U_lower_05[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; -static word _U_lower_10[256] = { -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0x10D0,0x10D1,0x10D2,0x10D3,0x10D4,0x10D5,0x10D6,0x10D7,0x10D8,0x10D9,0x10DA,0x10DB,0x10DC,0x10DD,0x10DE,0x10DF, -0x10E0,0x10E1,0x10E2,0x10E3,0x10E4,0x10E5,0x10E6,0x10E7,0x10E8,0x10E9,0x10EA,0x10EB,0x10EC,0x10ED,0x10EE,0x10EF, -0x10F0,0x10F1,0x10F2,0x10F3,0x10F4,0x10F5,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - static word _U_lower_1E[256] = { 0x1E01,0,0x1E03,0,0x1E05,0,0x1E07,0,0x1E09,0,0x1E0B,0,0x1E0D,0,0x1E0F,0, 0x1E11,0,0x1E13,0,0x1E15,0,0x1E17,0,0x1E19,0,0x1E1B,0,0x1E1D,0,0x1E1F,0, @@ -174,7 +155,7 @@ static word _U_lower_1F[256] = { static word _U_lower_21[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0x03C9,0,0,0,0x006B,0x00E5,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -230,7 +211,7 @@ static word _U_lower_FF[256] = { word *_U_lower[256] = { _U_lower_00,_U_lower_01,_U_lower_02,_U_lower_03,_U_lower_04,_U_lower_05,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, -_U_lower_10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_lower_1E,_U_lower_1F, +NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_lower_1E,_U_lower_1F, NULL,_U_lower_21,NULL,NULL,_U_lower_24,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,NULL,NULL,NULL,NULL,NULL,NULL, diff --git a/charset/U-sig.h b/charset/U-sig.h deleted file mode 100644 index 5fceac33..00000000 --- a/charset/U-sig.h +++ /dev/null @@ -1,172 +0,0 @@ -/* Generated automatically by gentab. Please don't edit. */ - -static byte _U_sig_00[256] = { -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, -0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0,0,0,0,0, -0,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, -0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0x61,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0x6F,0,0,0,0,0, -0x41,0x41,0x41,0x41,0x41,0x41,0,0x43,0x45,0x45,0x45,0x45,0x49,0x49,0x49,0x49, -0,0x4E,0x4F,0x4F,0x4F,0x4F,0x4F,0,0,0x55,0x55,0x55,0x55,0x59,0,0, -0x41,0x41,0x41,0x41,0x41,0x41,0,0x43,0x45,0x45,0x45,0x45,0x49,0x49,0x49,0x49, -0,0x4E,0x4F,0x4F,0x4F,0x4F,0x4F,0,0,0x55,0x55,0x55,0x55,0x59,0,0x59 -}; - -static byte _U_sig_01[256] = { -0x41,0x41,0x41,0x41,0x41,0x41,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x43,0x44,0x44, -0,0,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x47,0x47,0x47,0x47, -0x47,0x47,0x47,0x47,0x48,0x48,0,0,0x49,0x49,0x49,0x49,0x49,0x49,0x49,0x49, -0x49,0x49,0,0,0x4A,0x4A,0x4B,0x4B,0,0x4C,0x4C,0x4C,0x4C,0x4C,0x4C,0, -0,0,0,0x4E,0x4E,0x4E,0x4E,0x4E,0x4E,0,0,0,0x4F,0x4F,0x4F,0x4F, -0x4F,0x4F,0,0,0x52,0x52,0x52,0x52,0x52,0x52,0x53,0x53,0x53,0x53,0x53,0x53, -0x53,0x53,0x54,0x54,0x54,0x54,0,0,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, -0x55,0x55,0x55,0x55,0x57,0x57,0x59,0x59,0x59,0x5A,0x5A,0x5A,0x5A,0x5A,0x5A,0x53, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0x4F,0x4F,0,0,0,0,0,0,0,0,0,0,0,0,0,0x55, -0x55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0x41,0x41,0x49, -0x49,0x4F,0x4F,0x55,0x55,0,0,0,0,0,0,0,0,0,0,0, -0x41,0x41,0,0,0,0,0x47,0x47,0x4B,0x4B,0x4F,0x4F,0,0,0,0, -0x6A,0,0,0,0x47,0x47,0,0,0,0,0,0,0,0,0,0 -}; - -static byte _U_sig_02[256] = { -0x41,0x41,0x41,0x41,0x45,0x45,0x45,0x45,0x49,0x49,0x49,0x49,0x4F,0x4F,0x4F,0x4F, -0x52,0x52,0x52,0x52,0x55,0x55,0x55,0x55,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -static byte _U_sig_1E[256] = { -0x41,0x41,0x42,0x42,0x42,0x42,0x42,0x42,0,0,0x44,0x44,0x44,0x44,0x44,0x44, -0x44,0x44,0x44,0x44,0,0,0,0,0x45,0x45,0x45,0x45,0,0,0x46,0x46, -0x47,0x47,0x48,0x48,0x48,0x48,0x48,0x48,0x48,0x48,0x48,0x48,0x49,0x49,0,0, -0x4B,0x4B,0x4B,0x4B,0x4B,0x4B,0x4C,0x4C,0,0,0x4C,0x4C,0x4C,0x4C,0x4D,0x4D, -0x4D,0x4D,0x4D,0x4D,0x4E,0x4E,0x4E,0x4E,0x4E,0x4E,0x4E,0x4E,0,0,0,0, -0,0,0,0,0x50,0x50,0x50,0x50,0x52,0x52,0x52,0x52,0,0,0x52,0x52, -0x53,0x53,0x53,0x53,0,0,0,0,0,0,0x54,0x54,0x54,0x54,0x54,0x54, -0x54,0x54,0x55,0x55,0x55,0x55,0x55,0x55,0,0,0,0,0x56,0x56,0x56,0x56, -0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x57,0x58,0x58,0x58,0x58,0x59,0x59, -0x5A,0x5A,0x5A,0x5A,0x5A,0x5A,0x68,0x74,0x77,0x79,0,0,0,0,0,0, -0x41,0x41,0x41,0x41,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0x45,0x45,0x45,0x45,0x45,0x45,0,0, -0,0,0,0,0,0,0,0,0x49,0x49,0x49,0x49,0x4F,0x4F,0x4F,0x4F, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0x55,0x55,0x55,0x55,0,0,0,0,0,0,0,0, -0,0,0x59,0x59,0x59,0x59,0x59,0x59,0x59,0x59,0,0,0,0,0,0 -}; - -static byte _U_sig_20[256] = { -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x6E, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -static byte _U_sig_21[256] = { -0,0,0x43,0,0,0,0,0,0,0,0x67,0x48,0x48,0x48,0x68,0, -0x49,0x49,0x4C,0x6C,0,0x4E,0,0,0x50,0x50,0x51,0x52,0x52,0x52,0,0, -0,0,0,0,0x5A,0,0,0,0x5A,0,0x4B,0,0x42,0x43,0,0x65, -0x45,0x46,0,0x4D,0x6F,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -static byte _U_sig_24[256] = { -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A, -0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A, -0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50, -0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -static byte _U_sig_FF[256] = { -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, -0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0,0,0,0,0, -0,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F, -0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -byte *_U_sig[256] = { -_U_sig_00,_U_sig_01,_U_sig_02,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,_U_sig_1E,NULL, -_U_sig_20,_U_sig_21,NULL,NULL,_U_sig_24,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,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,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,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,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,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,_U_sig_FF -}; diff --git a/charset/U-unacc.h b/charset/U-unacc.h index 94849bd4..f21d4748 100644 --- a/charset/U-unacc.h +++ b/charset/U-unacc.h @@ -34,15 +34,15 @@ static word _U_unaccent_01[256] = { 0x0075,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0x0041,0x0061,0x0049, 0x0069,0x004F,0x006F,0x0055,0x0075,0x00DC,0x00FC,0x00DC,0x00FC,0x00DC,0x00FC,0x00DC,0x00FC,0,0x00C4,0x00E4, -0x0041,0x0061,0x00C6,0x00E6,0,0,0x0047,0x0067,0x004B,0x006B,0x004F,0x006F,0x01EA,0x01EB,0x01B7,0x0292, -0x006A,0,0,0,0x0047,0x0067,0,0,0,0,0x00C5,0x00E5,0x00C6,0x00E6,0x00D8,0x00F8 +0x0226,0x0227,0x00C6,0x00E6,0,0,0x0047,0x0067,0x004B,0x006B,0x004F,0x006F,0x01EA,0x01EB,0x01B7,0x0292, +0x006A,0,0,0,0x0047,0x0067,0,0,0x004E,0x006E,0x00C5,0x00E5,0x00C6,0x00E6,0x00D8,0x00F8 }; static word _U_unaccent_02[256] = { 0x0041,0x0061,0x0041,0x0061,0x0045,0x0065,0x0045,0x0065,0x0049,0x0069,0x0049,0x0069,0x004F,0x006F,0x004F,0x006F, -0x0052,0x0072,0x0052,0x0072,0x0055,0x0075,0x0055,0x0075,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0x0052,0x0072,0x0052,0x0072,0x0055,0x0075,0x0055,0x0075,0x0053,0x0073,0x0054,0x0074,0,0,0x0048,0x0068, +0,0,0,0,0,0,0x0041,0x0061,0x0045,0x0065,0x00D6,0x00F6,0x00D5,0x00F5,0x004F,0x006F, +0x022E,0x022F,0x0059,0x0079,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -67,22 +67,22 @@ static word _U_unaccent_03[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0x0391,0,0x0395,0x0397,0x0399,0,0x039F,0,0x03A5,0x03A9, -0x03B9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0x03CA,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0x0399,0x03A5,0x03B1,0x03B5,0x03B7,0x03B9, -0x03C5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0x03CB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0x03B9,0x03C5,0x03BF,0x03C5,0x03C9,0, -0,0,0,0x03D2,0x03D2,0,0,0,0,0,0,0,0,0,0,0, +0x03B2,0x03B8,0x03A5,0x03D2,0x03D2,0x03C6,0x03C0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0x03BA,0x03C1,0x03C2,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static word _U_unaccent_04[256] = { -0,0x0415,0,0x0413,0,0,0,0x0406,0,0,0,0,0x041A,0,0x0423,0, +0x0415,0x0415,0,0x0413,0,0,0,0x0406,0,0,0,0,0x041A,0x0418,0x0423,0, 0,0,0,0,0,0,0,0,0,0x0418,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0x0438,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0x0435,0,0x0433,0,0,0,0x0456,0,0,0,0,0x043A,0,0x0443,0, +0x0435,0x0435,0,0x0433,0,0,0,0x0456,0,0,0,0,0x043A,0x0438,0x0443,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0x0474,0x0475,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -90,14 +90,14 @@ static word _U_unaccent_04[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0x0416,0x0436,0,0,0,0,0,0,0,0,0,0,0,0,0, -0x0410,0x0430,0x0410,0x0430,0x00C6,0x00E6,0x0415,0x0435,0x018F,0x0259,0x018F,0x0259,0x0416,0x0436,0x0417,0x0437, -0x01B7,0x0292,0x0418,0x0438,0x0418,0x0438,0x041E,0x043E,0x019F,0x0275,0x019F,0x0275,0,0,0x0423,0x0443, +0x0410,0x0430,0x0410,0x0430,0,0,0x0415,0x0435,0,0,0x04D8,0x04D9,0x0416,0x0436,0x0417,0x0437, +0,0,0x0418,0x0438,0x0418,0x0438,0x041E,0x043E,0,0,0x04E8,0x04E9,0x042D,0x044D,0x0423,0x0443, 0x0423,0x0443,0x0423,0x0443,0x0427,0x0447,0,0,0x042B,0x044B,0,0,0,0,0,0 }; static word _U_unaccent_1E[256] = { 0x0041,0x0061,0x0042,0x0062,0x0042,0x0062,0x0042,0x0062,0x00C7,0x00E7,0x0044,0x0064,0x0044,0x0064,0x0044,0x0064, -0x0044,0x0064,0x0044,0x0064,0x0112,0x0113,0x0112,0x0113,0x0045,0x0065,0x0045,0x0065,0x0114,0x0115,0x0046,0x0066, +0x0044,0x0064,0x0044,0x0064,0x0112,0x0113,0x0112,0x0113,0x0045,0x0065,0x0045,0x0065,0x0228,0x0229,0x0046,0x0066, 0x0047,0x0067,0x0048,0x0068,0x0048,0x0068,0x0048,0x0068,0x0048,0x0068,0x0048,0x0068,0x0049,0x0069,0x00CF,0x00EF, 0x004B,0x006B,0x004B,0x006B,0x004B,0x006B,0x004C,0x006C,0x1E36,0x1E37,0x004C,0x006C,0x004C,0x006C,0x004D,0x006D, 0x004D,0x006D,0x004D,0x006D,0x004E,0x006E,0x004E,0x006E,0x004E,0x006E,0x004E,0x006E,0x00D5,0x00F5,0x00D5,0x00F5, @@ -106,10 +106,10 @@ static word _U_unaccent_1E[256] = { 0x0054,0x0074,0x0055,0x0075,0x0055,0x0075,0x0055,0x0075,0x0168,0x0169,0x016A,0x016B,0x0056,0x0076,0x0056,0x0076, 0x0057,0x0077,0x0057,0x0077,0x0057,0x0077,0x0057,0x0077,0x0057,0x0077,0x0058,0x0078,0x0058,0x0078,0x0059,0x0079, 0x005A,0x007A,0x005A,0x007A,0x005A,0x007A,0x0068,0x0074,0x0077,0x0079,0,0x017F,0,0,0,0, -0x0041,0x0061,0x0041,0x0061,0x00C2,0x00E2,0x00C2,0x00E2,0x00C2,0x00E2,0x00C2,0x00E2,0x00C2,0x00E2,0x0102,0x0103, -0x0102,0x0103,0x0102,0x0103,0x0102,0x0103,0x0102,0x0103,0x0045,0x0065,0x0045,0x0065,0x0045,0x0065,0x00CA,0x00EA, -0x00CA,0x00EA,0x00CA,0x00EA,0x00CA,0x00EA,0x00CA,0x00EA,0x0049,0x0069,0x0049,0x0069,0x004F,0x006F,0x004F,0x006F, -0x00D4,0x00F4,0x00D4,0x00F4,0x00D4,0x00F4,0x00D4,0x00F4,0x00D4,0x00F4,0x01A0,0x01A1,0x01A0,0x01A1,0x01A0,0x01A1, +0x0041,0x0061,0x0041,0x0061,0x00C2,0x00E2,0x00C2,0x00E2,0x00C2,0x00E2,0x00C2,0x00E2,0x1EA0,0x1EA1,0x0102,0x0103, +0x0102,0x0103,0x0102,0x0103,0x0102,0x0103,0x1EA0,0x1EA1,0x0045,0x0065,0x0045,0x0065,0x0045,0x0065,0x00CA,0x00EA, +0x00CA,0x00EA,0x00CA,0x00EA,0x00CA,0x00EA,0x1EB8,0x1EB9,0x0049,0x0069,0x0049,0x0069,0x004F,0x006F,0x004F,0x006F, +0x00D4,0x00F4,0x00D4,0x00F4,0x00D4,0x00F4,0x00D4,0x00F4,0x1ECC,0x1ECD,0x01A0,0x01A1,0x01A0,0x01A1,0x01A0,0x01A1, 0x01A0,0x01A1,0x01A0,0x01A1,0x0055,0x0075,0x0055,0x0075,0x01AF,0x01B0,0x01AF,0x01B0,0x01AF,0x01B0,0x01AF,0x01B0, 0x01AF,0x01B0,0x0059,0x0079,0x0059,0x0079,0x0059,0x0079,0x0059,0x0079,0,0,0,0,0,0 }; @@ -122,15 +122,15 @@ static word _U_unaccent_1F[256] = { 0x03BF,0x03BF,0x1F40,0x1F41,0x1F40,0x1F41,0,0,0x039F,0x039F,0x1F48,0x1F49,0x1F48,0x1F49,0,0, 0x03C5,0x03C5,0x1F50,0x1F51,0x1F50,0x1F51,0x1F50,0x1F51,0,0x03A5,0,0x1F59,0,0x1F59,0,0x1F59, 0x03C9,0x03C9,0x1F60,0x1F61,0x1F60,0x1F61,0x1F60,0x1F61,0x03A9,0x03A9,0x1F68,0x1F69,0x1F68,0x1F69,0x1F68,0x1F69, -0x03B1,0x03B1,0x03B5,0x03B5,0x03B7,0x03B7,0x03B9,0x03B9,0x03BF,0x03BF,0x03C5,0x03C5,0x03C9,0x03C9,0,0, +0x03B1,0x03AC,0x03B5,0x03AD,0x03B7,0x03AE,0x03B9,0x03AF,0x03BF,0x03CC,0x03C5,0x03CD,0x03C9,0x03CE,0,0, 0x1F00,0x1F01,0x1F02,0x1F03,0x1F04,0x1F05,0x1F06,0x1F07,0x1F08,0x1F09,0x1F0A,0x1F0B,0x1F0C,0x1F0D,0x1F0E,0x1F0F, 0x1F20,0x1F21,0x1F22,0x1F23,0x1F24,0x1F25,0x1F26,0x1F27,0x1F28,0x1F29,0x1F2A,0x1F2B,0x1F2C,0x1F2D,0x1F2E,0x1F2F, 0x1F60,0x1F61,0x1F62,0x1F63,0x1F64,0x1F65,0x1F66,0x1F67,0x1F68,0x1F69,0x1F6A,0x1F6B,0x1F6C,0x1F6D,0x1F6E,0x1F6F, -0x03B1,0x03B1,0x1F70,0x03B1,0x1F71,0,0x03B1,0x1FB6,0x0391,0x0391,0x0391,0x0391,0x0391,0,0x0399,0, -0,0,0x1F74,0x03B7,0x1F75,0,0x03B7,0x1FC6,0x0395,0x0395,0x0397,0x0397,0x0397,0,0,0, -0x03B9,0x03B9,0x03CA,0x03CA,0,0,0x03B9,0x03CA,0x0399,0x0399,0x0399,0x0399,0,0,0,0, -0x03C5,0x03C5,0x03CB,0x03CB,0x03C1,0x03C1,0x03C5,0x03CB,0x03A5,0x03A5,0x03A5,0x03A5,0x03A1,0,0,0, -0,0,0x1F7C,0x03C9,0x1F79,0,0x03C9,0x1FF6,0x039F,0x039F,0x03A9,0x03A9,0x03A9,0,0,0 +0x03B1,0x03B1,0x1F70,0x03B1,0x03AC,0,0x03B1,0x1FB6,0x0391,0x0391,0x0391,0x0386,0x0391,0,0x03B9,0, +0,0,0x1F74,0x03B7,0x03AE,0,0x03B7,0x1FC6,0x0395,0x0388,0x0397,0x0389,0x0397,0,0,0, +0x03B9,0x03B9,0x03CA,0x0390,0,0,0x03B9,0x03CA,0x0399,0x0399,0x0399,0x038A,0,0,0,0, +0x03C5,0x03C5,0x03CB,0x03B0,0x03C1,0x03C1,0x03C5,0x03CB,0x03A5,0x03A5,0x03A5,0x038E,0x03A1,0,0,0, +0,0,0x1F7C,0x03C9,0x03CE,0,0x03C9,0x1FF6,0x039F,0x038C,0x03A9,0x038F,0x03A9,0,0,0 }; static word _U_unaccent_20[256] = { @@ -154,9 +154,9 @@ static word _U_unaccent_20[256] = { static word _U_unaccent_21[256] = { 0,0,0x0043,0,0,0,0,0x0190,0,0,0x0067,0x0048,0x0048,0x0048,0x0068,0x0127, -0x0049,0x0049,0x004C,0x006C,0,0x004E,0,0,0x0050,0x0050,0x0051,0x0052,0x0052,0x0052,0,0, +0x0049,0x0049,0x004C,0x006C,0,0x004E,0,0,0,0x0050,0x0051,0x0052,0x0052,0x0052,0,0, 0,0,0,0,0x005A,0,0x03A9,0,0x005A,0,0x004B,0x00C5,0x0042,0x0043,0,0x0065, -0x0045,0x0046,0,0x004D,0x006F,0,0,0,0,0,0,0,0,0,0,0, +0x0045,0x0046,0,0x004D,0x006F,0,0,0,0,0x0069,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x0049,0,0,0,0x0056,0,0,0,0,0x0058,0,0,0x004C,0x0043,0x0044,0x004D, diff --git a/charset/U-upper.h b/charset/U-upper.h index 8d5ae5f7..7d18361b 100644 --- a/charset/U-upper.h +++ b/charset/U-upper.h @@ -12,7 +12,7 @@ static word _U_upper_00[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0x039C,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF, @@ -29,25 +29,25 @@ static word _U_upper_01[256] = { 0,0x0160,0,0x0162,0,0x0164,0,0x0166,0,0x0168,0,0x016A,0,0x016C,0,0x016E, 0,0x0170,0,0x0172,0,0x0174,0,0x0176,0,0,0x0179,0,0x017B,0,0x017D,0x0053, 0,0,0,0x0182,0,0x0184,0,0,0x0187,0,0,0,0x018B,0,0,0, -0,0,0x0191,0,0,0,0,0,0,0x0198,0,0,0,0,0,0, +0,0,0x0191,0,0,0x01F6,0,0,0,0x0198,0,0,0,0,0,0, 0,0x01A0,0,0x01A2,0,0x01A4,0,0,0x01A7,0,0,0,0,0x01AC,0,0, -0x01AF,0,0,0,0x01B3,0,0x01B5,0,0,0x01B8,0,0,0,0x01BC,0,0, +0x01AF,0,0,0,0x01B3,0,0x01B5,0,0,0x01B8,0,0,0,0x01BC,0,0x01F7, 0,0,0,0,0,0x01C4,0x01C4,0,0x01C7,0x01C7,0,0x01CA,0x01CA,0,0x01CD,0, -0x01CF,0,0x01D1,0,0x01D3,0,0x01D5,0,0x01D7,0,0x01D9,0,0x01DB,0,0,0x01DE, +0x01CF,0,0x01D1,0,0x01D3,0,0x01D5,0,0x01D7,0,0x01D9,0,0x01DB,0x018E,0,0x01DE, 0,0x01E0,0,0x01E2,0,0x01E4,0,0x01E6,0,0x01E8,0,0x01EA,0,0x01EC,0,0x01EE, -0,0,0x01F1,0x01F1,0,0x01F4,0,0,0,0,0,0x01FA,0,0x01FC,0,0x01FE +0,0,0x01F1,0x01F1,0,0x01F4,0,0,0,0x01F8,0,0x01FA,0,0x01FC,0,0x01FE }; static word _U_upper_02[256] = { 0,0x0200,0,0x0202,0,0x0204,0,0x0206,0,0x0208,0,0x020A,0,0x020C,0,0x020E, -0,0x0210,0,0x0212,0,0x0214,0,0x0216,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0x0210,0,0x0212,0,0x0214,0,0x0216,0,0x0218,0,0x021A,0,0x021C,0,0x021E, +0,0,0,0x0222,0,0x0224,0,0x0226,0,0x0228,0,0x022A,0,0x022C,0,0x022E, +0,0x0230,0,0x0232,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0x0181,0x0186,0,0x0189,0x018A,0x018E,0x018F,0,0x0190,0,0,0,0, +0,0,0,0x0181,0x0186,0,0x0189,0x018A,0,0x018F,0,0x0190,0,0,0,0, 0x0193,0,0,0x0194,0,0,0,0,0x0197,0x0196,0,0,0,0,0,0x019C, -0,0,0x019D,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0x01A9,0,0,0,0,0x01AE,0,0x01B1,0x01B2,0,0,0,0, +0,0,0x019D,0,0,0x019F,0,0,0,0,0,0,0,0,0,0, +0x01A6,0,0,0x01A9,0,0,0,0,0x01AE,0,0x01B1,0x01B2,0,0,0,0, 0,0,0x01B7,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -62,7 +62,7 @@ static word _U_upper_03[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0x0399,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -70,10 +70,10 @@ static word _U_upper_03[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0x0386,0x0388,0x0389,0x038A, 0,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398,0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F, -0x03A0,0x03A1,0,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,0x03AA,0x03AB,0x038C,0x038E,0x038F,0, -0x0392,0x0398,0,0,0,0x03A6,0x03A0,0,0,0,0,0,0,0,0,0, -0,0,0,0x03E2,0,0x03E4,0,0x03E6,0,0x03E8,0,0x03EA,0,0x03EC,0,0x03EE, -0x039A,0x03A1,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0x03A0,0x03A1,0x03A3,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,0x03AA,0x03AB,0x038C,0x038E,0x038F,0, +0x0392,0x0398,0,0,0,0x03A6,0x03A0,0,0,0,0,0x03DA,0,0x03DC,0,0x03DE, +0,0x03E0,0,0x03E2,0,0x03E4,0,0x03E6,0,0x03E8,0,0x03EA,0,0x03EC,0,0x03EE, +0x039A,0x03A1,0x03A3,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static word _U_upper_04[256] = { @@ -82,16 +82,16 @@ static word _U_upper_04[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F, 0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F, -0,0x0401,0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409,0x040A,0x040B,0x040C,0,0x040E,0x040F, +0x0400,0x0401,0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409,0x040A,0x040B,0x040C,0x040D,0x040E,0x040F, 0,0x0460,0,0x0462,0,0x0464,0,0x0466,0,0x0468,0,0x046A,0,0x046C,0,0x046E, 0,0x0470,0,0x0472,0,0x0474,0,0x0476,0,0x0478,0,0x047A,0,0x047C,0,0x047E, -0,0x0480,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0x0480,0,0,0,0,0,0,0,0,0,0,0,0x048C,0,0x048E, 0,0x0490,0,0x0492,0,0x0494,0,0x0496,0,0x0498,0,0x049A,0,0x049C,0,0x049E, 0,0x04A0,0,0x04A2,0,0x04A4,0,0x04A6,0,0x04A8,0,0x04AA,0,0x04AC,0,0x04AE, 0,0x04B0,0,0x04B2,0,0x04B4,0,0x04B6,0,0x04B8,0,0x04BA,0,0x04BC,0,0x04BE, 0,0,0x04C1,0,0x04C3,0,0,0,0x04C7,0,0,0,0x04CB,0,0,0, 0,0x04D0,0,0x04D2,0,0x04D4,0,0x04D6,0,0x04D8,0,0x04DA,0,0x04DC,0,0x04DE, -0,0x04E0,0,0x04E2,0,0x04E4,0,0x04E6,0,0x04E8,0,0x04EA,0,0,0,0x04EE, +0,0x04E0,0,0x04E2,0,0x04E4,0,0x04E6,0,0x04E8,0,0x04EA,0,0x04EC,0,0x04EE, 0,0x04F0,0,0x04F2,0,0x04F4,0,0,0,0x04F8,0,0,0,0,0,0 }; @@ -124,7 +124,7 @@ static word _U_upper_1E[256] = { 0,0x1E60,0,0x1E62,0,0x1E64,0,0x1E66,0,0x1E68,0,0x1E6A,0,0x1E6C,0,0x1E6E, 0,0x1E70,0,0x1E72,0,0x1E74,0,0x1E76,0,0x1E78,0,0x1E7A,0,0x1E7C,0,0x1E7E, 0,0x1E80,0,0x1E82,0,0x1E84,0,0x1E86,0,0x1E88,0,0x1E8A,0,0x1E8C,0,0x1E8E, -0,0x1E90,0,0x1E92,0,0x1E94,0,0,0,0,0,0,0,0,0,0, +0,0x1E90,0,0x1E92,0,0x1E94,0,0,0,0,0,0x1E60,0,0,0,0, 0,0x1EA0,0,0x1EA2,0,0x1EA4,0,0x1EA6,0,0x1EA8,0,0x1EAA,0,0x1EAC,0,0x1EAE, 0,0x1EB0,0,0x1EB2,0,0x1EB4,0,0x1EB6,0,0x1EB8,0,0x1EBA,0,0x1EBC,0,0x1EBE, 0,0x1EC0,0,0x1EC2,0,0x1EC4,0,0x1EC6,0,0x1EC8,0,0x1ECA,0,0x1ECC,0,0x1ECE, @@ -145,7 +145,7 @@ static word _U_upper_1F[256] = { 0x1F88,0x1F89,0x1F8A,0x1F8B,0x1F8C,0x1F8D,0x1F8E,0x1F8F,0,0,0,0,0,0,0,0, 0x1F98,0x1F99,0x1F9A,0x1F9B,0x1F9C,0x1F9D,0x1F9E,0x1F9F,0,0,0,0,0,0,0,0, 0x1FA8,0x1FA9,0x1FAA,0x1FAB,0x1FAC,0x1FAD,0x1FAE,0x1FAF,0,0,0,0,0,0,0,0, -0x1FB8,0x1FB9,0,0x1FBC,0,0,0,0,0,0,0,0,0,0,0,0, +0x1FB8,0x1FB9,0,0x1FBC,0,0,0,0,0,0,0,0,0,0,0x0399,0, 0,0,0,0x1FCC,0,0,0,0,0,0,0,0,0,0,0,0, 0x1FD8,0x1FD9,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x1FE8,0x1FE9,0,0,0,0x1FEC,0,0,0,0,0,0,0,0,0,0, diff --git a/charset/chartable.h b/charset/chartable.h index fc5b8f34..19e49e99 100644 --- a/charset/chartable.h +++ b/charset/chartable.h @@ -1,6 +1,6 @@ /* Generated by tabgen 1.0, please don't edit manually. */ -static unsigned short int input_to_x[8][256] = { +static unsigned short int input_to_x[11][256] = { /* set/ascii */ { @@ -161,9 +161,69 @@ static unsigned short int input_to_x[8][256] = { 439, 262, 314, 315, 274, 261, 272, 193, 264, 276, 205, 266, 279, 440, 211, 212, 441, 294, 218, 310, 295, 311, 442, 443, 221, 253, 444, 267, 259, 280, 445, 330, }, + +/* set/cork */ +{ +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, +16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, +112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, +282, 257, 284, 285, 288, 287, 286, 446, 283, 260, 259, 290, 291, 447, 292, 281, +293, 261, 262, 263, 264, 296, 295, 294, 448, 265, 266, 267, 449, 450, 240, 167, +298, 268, 300, 301, 304, 303, 302, 451, 299, 271, 270, 306, 307, 452, 308, 297, +309, 272, 274, 275, 276, 312, 311, 310, 255, 277, 279, 280, 453, 161, 191, 163, +192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, +208, 209, 210, 211, 212, 213, 214, 454, 216, 217, 218, 219, 220, 221, 222, 455, +224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +240, 241, 242, 243, 244, 245, 246, 456, 248, 249, 250, 251, 252, 253, 254, 223, +}, + +/* set/ibm-ctrl */ +{ +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, +16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, +112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 337, +199, 252, 233, 226, 228, 224, 229, 231, 234, 235, 232, 239, 238, 236, 196, 197, +201, 230, 198, 244, 246, 242, 251, 249, 255, 214, 220, 162, 163, 165, 457, 458, +225, 237, 243, 250, 241, 209, 170, 186, 191, 459, 172, 189, 188, 161, 171, 187, +338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, +354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, +370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, +386, 223, 460, 389, 390, 391, 181, 392, 393, 394, 395, 396, 397, 398, 461, 400, +414, 177, 402, 403, 404, 405, 247, 406, 176, 407, 183, 408, 409, 178, 410, 160, +}, + +/* set/mac */ +{ +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, +16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, +112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, +196, 197, 199, 201, 209, 214, 220, 225, 224, 226, 228, 227, 229, 231, 233, 232, +234, 235, 237, 236, 238, 239, 241, 243, 242, 244, 246, 245, 250, 249, 251, 252, +317, 176, 162, 163, 167, 325, 182, 223, 174, 169, 328, 180, 332, 421, 198, 216, +397, 177, 403, 402, 165, 334, 428, 429, 462, 389, 463, 170, 186, 395, 230, 248, +191, 161, 172, 408, 464, 406, 434, 171, 187, 316, 160, 192, 195, 213, 454, 456, +327, 326, 323, 324, 321, 322, 247, 436, 255, 448, 465, 164, 320, 329, 466, 467, +318, 183, 314, 315, 319, 194, 202, 193, 203, 200, 205, 206, 207, 204, 211, 212, +256, 210, 218, 219, 217, 468, 412, 469, 470, 331, 313, 471, 335, 336, 333, 330, +}, }; -static unsigned short int x_to_uni[446] = { +static unsigned short int x_to_uni[472] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -191,7 +251,9 @@ static unsigned short int x_to_uni[446] = { 9616, 9600, 945, 946, 404, 960, 931, 963, 964, 934, 920, 937, 948, 8734, 966, 8712, 8745, 8781, 8805, 8804, 8992, 8993, 8776, 8729, 8730, 8319, 9632, 61442, 770, 61440, 8801, 256, 257, 274, 275, 278, 279, 8800, 501, 302, 303, 298, 299, 310, 8706, 8721, 315, 316, -325, 326, 916, 332, 8900, 333, 342, 343, 362, 363, 370, 371, 311, 290, +325, 326, 916, 332, 8900, 333, 342, 343, 362, 363, 370, 371, 311, 290, 286, 330, +376, 306, 304, 287, 331, 307, 338, 61663, 339, 8359, 402, 8976, 915, 949, 8719, 8747, +61443, 8260, 64257, 64258, 305, 771, 772, 778, }; static unsigned short int uni_to_x_0[256] = { @@ -215,15 +277,15 @@ static unsigned short int uni_to_x_0[256] = { static unsigned short int uni_to_x_1[256] = { 415, 416, 282, 298, 257, 268, 284, 300, 256, 256, 256, 256, 285, 301, 288, 304, -289, 305, 417, 418, 256, 256, 419, 420, 286, 302, 287, 303, 256, 256, 256, 256, +289, 305, 417, 418, 256, 256, 419, 420, 286, 302, 287, 303, 256, 256, 446, 451, 256, 256, 445, 256, 256, 256, 256, 256, 256, 256, 425, 426, 256, 256, 423, 424, -256, 256, 256, 256, 256, 256, 427, 444, 256, 283, 299, 430, 431, 260, 271, 256, -256, 259, 270, 290, 306, 432, 433, 291, 307, 256, 256, 256, 435, 437, 256, 256, -292, 308, 256, 256, 281, 297, 438, 439, 293, 309, 261, 272, 256, 256, 263, 275, +450, 468, 449, 453, 256, 256, 427, 444, 256, 283, 299, 430, 431, 260, 271, 256, +256, 259, 270, 290, 306, 432, 433, 291, 307, 256, 447, 452, 435, 437, 256, 256, +292, 308, 454, 456, 281, 297, 438, 439, 293, 309, 261, 272, 256, 256, 263, 275, 262, 274, 296, 312, 264, 276, 256, 256, 256, 256, 440, 441, 256, 256, 294, 310, -295, 311, 442, 443, 256, 256, 256, 256, 256, 265, 277, 267, 280, 266, 279, 256, +295, 311, 442, 443, 256, 256, 256, 256, 448, 265, 277, 267, 280, 266, 279, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, -256, 256, 256, 256, 388, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 458, 256, 388, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, @@ -252,7 +314,7 @@ static unsigned short int uni_to_x_2[256] = { }; static unsigned short int uni_to_x_3[256] = { -256, 256, 412, 256, 256, 256, 331, 256, 332, 256, 256, 336, 330, 256, 256, 256, +256, 256, 412, 469, 470, 256, 331, 256, 332, 256, 471, 336, 330, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 335, 333, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, @@ -261,9 +323,9 @@ static unsigned short int uni_to_x_3[256] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, -256, 256, 256, 256, 434, 256, 256, 256, 394, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 460, 434, 256, 256, 256, 394, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 390, 256, 256, 393, 256, 256, 395, 256, 256, 256, 256, 256, 256, -256, 386, 387, 256, 396, 256, 256, 256, 256, 256, 256, 256, 334, 256, 256, 256, +256, 386, 387, 256, 396, 461, 256, 256, 256, 256, 256, 256, 334, 256, 256, 256, 389, 256, 256, 391, 392, 256, 398, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, @@ -294,13 +356,13 @@ static unsigned short int uni_to_x_32[256] = { 256, 256, 256, 326, 327, 256, 256, 256, 321, 322, 314, 256, 323, 324, 315, 256, 317, 318, 325, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 319, 256, 256, 256, 256, 256, 256, 256, 256, 320, 329, 256, 256, 256, 256, 256, -256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 465, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 409, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, -256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 457, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, @@ -328,9 +390,9 @@ static unsigned short int uni_to_x_33[256] = { }; static unsigned short int uni_to_x_34[256] = { -256, 256, 428, 256, 256, 256, 256, 256, 399, 256, 256, 256, 256, 256, 256, 256, +256, 256, 428, 256, 256, 256, 256, 256, 399, 256, 256, 256, 256, 256, 256, 462, 256, 429, 256, 256, 256, 256, 256, 256, 256, 407, 408, 256, 256, 256, 397, 256, -256, 256, 256, 256, 256, 256, 256, 256, 256, 400, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 400, 256, 463, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 406, 256, 256, 256, 256, 401, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, @@ -348,7 +410,7 @@ static unsigned short int uni_to_x_34[256] = { static unsigned short int uni_to_x_35[256] = { 256, 256, 337, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, -256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +459, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 404, 405, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, @@ -385,7 +447,26 @@ static unsigned short int uni_to_x_37[256] = { }; static unsigned short int uni_to_x_240[256] = { -413, 256, 411, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +413, 256, 411, 464, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 455, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +}; + +static unsigned short int uni_to_x_251[256] = { +256, 466, 467, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, @@ -485,11 +566,11 @@ uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_240, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, -uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, +uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_251, uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255, }; -static unsigned short int x_to_output[8][446] = { +static unsigned short int x_to_output[11][472] = { /* set/ascii */ { @@ -520,7 +601,9 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108, -78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, +78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 71, 256, +89, 278, 73, 103, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, }, /* set/latin1 */ @@ -552,7 +635,9 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108, -78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, +78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 71, 256, +89, 278, 73, 103, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, }, /* set/latin2 */ @@ -584,7 +669,9 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108, -78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, +78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 71, 256, +89, 278, 73, 103, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, }, /* set/win-1250 */ @@ -601,10 +688,10 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 160, 256, 256, 256, 164, 256, 166, 167, 168, 169, 97, 171, 172, 173, 174, 256, 176, 177, 50, 51, 180, 181, 256, 183, 184, 49, 111, 187, 257, 261, 265, 256, -65, 193, 194, 65, 196, 65, 269, 199, 69, 201, 69, 203, 73, 205, 206, 278, +65, 193, 194, 65, 196, 65, 269, 199, 69, 201, 69, 203, 73, 205, 206, 290, 208, 78, 79, 211, 212, 79, 214, 215, 256, 85, 218, 85, 220, 221, 256, 223, -97, 225, 226, 97, 228, 97, 272, 231, 101, 233, 101, 235, 105, 237, 238, 281, -240, 110, 111, 243, 244, 111, 246, 247, 256, 117, 250, 117, 252, 253, 256, 284, +97, 225, 226, 97, 228, 97, 272, 231, 101, 233, 101, 235, 105, 237, 238, 293, +240, 110, 111, 243, 244, 111, 246, 247, 256, 117, 250, 117, 252, 253, 256, 296, 256, 165, 162, 163, 188, 140, 138, 170, 141, 143, 142, 175, 185, 178, 179, 190, 156, 256, 154, 186, 157, 159, 189, 158, 191, 192, 195, 197, 198, 200, 202, 204, 207, 256, 209, 210, 213, 216, 217, 219, 222, 224, 227, 229, 230, 232, 234, 236, @@ -615,8 +702,10 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65, -97, 69, 101, 69, 101, 61, 103, 287, 290, 73, 105, 293, 256, 256, 296, 299, -302, 305, 256, 79, 256, 111, 308, 311, 85, 117, 314, 317, 320, 323, +97, 69, 101, 69, 101, 61, 103, 299, 302, 73, 105, 305, 256, 256, 308, 311, +314, 317, 256, 79, 256, 111, 320, 323, 85, 117, 326, 329, 332, 335, 338, 256, +341, 278, 73, 344, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, }, /* set/kamen-ctrl */ @@ -648,7 +737,9 @@ static unsigned short int x_to_output[8][446] = { 222, 223, 224, 225, 226, 227, 228, 229, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 242, 243, 244, 245, 247, 249, 251, 252, 254, 256, 256, 256, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108, -78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, +78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 71, 256, +89, 278, 73, 103, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, }, /* set/koi8 */ @@ -665,10 +756,10 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 97, 256, 256, 256, 256, 256, 254, 256, 50, 51, 224, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 256, -65, 225, 326, 65, 241, 65, 269, 67, 69, 247, 329, 69, 73, 233, 332, 73, -256, 78, 79, 239, 240, 79, 237, 256, 256, 85, 245, 335, 232, 249, 256, 256, -216, 193, 338, 97, 209, 97, 272, 99, 101, 215, 341, 101, 105, 201, 344, 105, -256, 110, 111, 207, 208, 111, 205, 256, 256, 117, 213, 347, 200, 217, 256, 121, +65, 225, 347, 65, 241, 65, 269, 67, 69, 247, 350, 69, 73, 233, 353, 73, +256, 78, 79, 239, 240, 79, 237, 256, 256, 85, 245, 356, 232, 249, 256, 256, +216, 193, 359, 97, 209, 97, 272, 99, 101, 215, 362, 101, 105, 201, 365, 105, +256, 110, 111, 207, 208, 111, 205, 256, 256, 117, 213, 368, 200, 217, 256, 121, 256, 65, 256, 256, 236, 83, 243, 83, 244, 90, 250, 90, 97, 256, 256, 204, 115, 256, 211, 115, 212, 122, 256, 218, 122, 230, 248, 235, 67, 227, 69, 229, 228, 256, 78, 238, 79, 242, 234, 85, 84, 198, 97, 203, 99, 195, 101, 197, @@ -680,7 +771,9 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 199, 222, 231, 256, 65, 97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108, -78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, +78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 71, 256, +89, 278, 73, 103, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, }, /* set/pc-latin-2 */ @@ -697,10 +790,10 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 255, 256, 256, 256, 207, 256, 256, 245, 249, 256, 97, 175, 170, 256, 256, 256, 256, 256, 50, 51, 239, 256, 256, 256, 247, 49, 111, 174, 257, 261, 265, 256, -65, 181, 182, 65, 142, 65, 269, 128, 69, 144, 69, 211, 73, 214, 215, 350, +65, 181, 182, 65, 142, 65, 269, 128, 69, 144, 69, 211, 73, 214, 215, 371, 209, 78, 79, 224, 226, 79, 153, 158, 256, 85, 233, 85, 154, 237, 256, 225, -97, 160, 131, 97, 132, 97, 272, 135, 101, 130, 101, 137, 105, 161, 140, 353, -208, 110, 111, 162, 147, 111, 148, 246, 256, 117, 163, 117, 129, 236, 256, 356, +97, 160, 131, 97, 132, 97, 272, 135, 101, 130, 101, 137, 105, 161, 140, 374, +208, 110, 111, 162, 147, 111, 148, 246, 256, 117, 163, 117, 129, 236, 256, 377, 256, 164, 244, 157, 149, 151, 230, 184, 155, 141, 166, 189, 165, 242, 136, 150, 152, 256, 231, 173, 156, 171, 241, 167, 190, 232, 198, 145, 143, 172, 168, 183, 210, 256, 227, 213, 138, 252, 222, 235, 221, 234, 199, 146, 134, 159, 169, 216, @@ -711,8 +804,10 @@ static unsigned short int x_to_output[8][446] = { 206, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 217, 218, 219, 220, 256, 256, 223, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 254, 256, 256, 256, 240, 65, -97, 69, 101, 69, 101, 61, 103, 359, 362, 73, 105, 365, 256, 256, 368, 371, -374, 377, 256, 79, 256, 111, 380, 383, 85, 117, 386, 389, 392, 395, +97, 69, 101, 69, 101, 61, 103, 380, 383, 73, 105, 386, 256, 256, 389, 392, +395, 398, 256, 79, 256, 111, 401, 404, 85, 117, 407, 410, 413, 416, 419, 256, +422, 278, 73, 425, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, }, /* set/macce */ @@ -729,10 +824,10 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 202, 256, 256, 163, 256, 256, 256, 164, 172, 169, 97, 199, 194, 256, 168, 256, 161, 256, 50, 51, 256, 256, 166, 256, 256, 49, 111, 200, 257, 261, 265, 256, -65, 231, 65, 65, 128, 65, 269, 67, 69, 131, 69, 398, 73, 234, 73, 401, +65, 231, 65, 65, 128, 65, 269, 67, 69, 131, 69, 428, 73, 234, 73, 431, 256, 78, 79, 238, 239, 205, 133, 256, 256, 85, 242, 85, 134, 248, 256, 167, -97, 135, 97, 97, 138, 97, 272, 99, 101, 142, 101, 404, 105, 146, 105, 407, -256, 110, 111, 151, 153, 155, 154, 214, 256, 117, 156, 117, 159, 249, 256, 410, +97, 135, 97, 97, 138, 97, 272, 99, 101, 142, 101, 434, 105, 146, 105, 437, +256, 110, 111, 151, 153, 155, 154, 214, 256, 117, 156, 117, 159, 249, 256, 440, 256, 132, 256, 252, 187, 229, 225, 83, 232, 143, 235, 251, 136, 256, 184, 188, 230, 256, 228, 115, 233, 144, 256, 236, 253, 217, 65, 189, 140, 137, 162, 157, 145, 256, 193, 197, 204, 219, 241, 244, 84, 218, 97, 190, 141, 139, 171, 158, @@ -744,7 +839,111 @@ static unsigned short int x_to_output[8][446] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 179, 178, 256, 256, 256, 256, 195, 110, 256, 256, 256, 256, 256, 129, 130, 148, 149, 150, 152, 173, 174, 175, 176, 177, 180, 181, 182, 183, 185, 186, -191, 192, 198, 207, 215, 216, 223, 224, 237, 240, 246, 247, 250, 254, +191, 192, 198, 207, 215, 216, 223, 224, 237, 240, 246, 247, 250, 254, 71, 256, +443, 278, 73, 103, 256, 281, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, +}, + +/* set/cork */ +{ +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, +16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, +112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 189, 256, 191, 256, 256, 256, 159, 256, 256, 97, 256, 256, 256, 256, 256, +256, 256, 50, 51, 256, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 190, +192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, +208, 209, 210, 211, 212, 213, 214, 256, 216, 217, 218, 219, 220, 221, 222, 255, +224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +240, 241, 242, 243, 244, 245, 246, 256, 248, 249, 250, 251, 252, 253, 254, 184, +256, 129, 256, 138, 137, 145, 146, 147, 148, 153, 154, 155, 161, 256, 170, 169, +177, 256, 178, 179, 180, 185, 256, 186, 187, 143, 128, 136, 130, 131, 134, 133, +132, 256, 139, 140, 142, 144, 151, 150, 149, 175, 160, 168, 162, 163, 166, 165, +164, 256, 171, 172, 174, 176, 183, 182, 181, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 110, 256, 256, 256, 256, 256, 65, +97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108, +78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 135, 141, +152, 156, 157, 167, 173, 188, 215, 223, 247, 256, 256, 256, 256, 256, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, +}, + +/* set/ibm-ctrl */ +{ +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, +16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, +112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +255, 173, 155, 156, 256, 157, 256, 256, 256, 256, 166, 174, 170, 256, 256, 256, +248, 241, 253, 51, 256, 230, 256, 250, 256, 49, 167, 175, 172, 171, 265, 168, +65, 65, 65, 65, 142, 143, 146, 128, 69, 144, 69, 69, 73, 73, 73, 73, +256, 165, 79, 79, 79, 79, 153, 256, 256, 85, 85, 85, 154, 89, 256, 225, +133, 160, 131, 97, 132, 134, 145, 135, 138, 130, 136, 137, 141, 161, 140, 139, +256, 164, 149, 162, 147, 111, 148, 246, 256, 151, 163, 150, 129, 121, 256, 152, +256, 65, 256, 256, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 256, 108, +115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69, +68, 256, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101, +100, 256, 110, 110, 111, 114, 117, 117, 116, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 275, 256, 256, 256, 256, 256, 256, 256, +256, 127, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, +190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, +206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, +222, 223, 224, 256, 256, 227, 228, 229, 231, 232, 233, 234, 235, 236, 237, 256, +239, 256, 242, 243, 244, 245, 247, 249, 251, 252, 254, 256, 256, 256, 240, 65, +97, 69, 101, 69, 101, 61, 103, 73, 105, 73, 105, 75, 256, 256, 76, 108, +78, 110, 256, 79, 256, 111, 82, 114, 85, 117, 85, 117, 107, 71, 71, 256, +89, 278, 73, 103, 256, 281, 256, 256, 256, 158, 159, 169, 226, 238, 256, 256, +256, 47, 284, 287, 256, 256, 256, 256, +}, + +/* set/mac */ +{ +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, +16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, +32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, +48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, +96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, +112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +202, 193, 162, 163, 219, 180, 256, 164, 172, 169, 187, 199, 194, 256, 168, 248, +161, 177, 50, 51, 171, 181, 166, 225, 252, 49, 188, 200, 446, 450, 454, 192, +203, 231, 229, 204, 128, 129, 174, 130, 233, 131, 230, 232, 237, 234, 235, 236, +256, 132, 241, 238, 239, 205, 133, 256, 175, 244, 242, 243, 134, 89, 256, 167, +136, 135, 137, 139, 138, 140, 190, 141, 143, 142, 144, 145, 147, 146, 148, 149, +256, 150, 152, 151, 153, 155, 154, 214, 191, 157, 156, 158, 159, 121, 256, 216, +256, 458, 249, 256, 461, 83, 464, 467, 470, 90, 473, 90, 476, 254, 256, 479, +115, 256, 482, 485, 488, 122, 253, 491, 122, 82, 494, 76, 67, 497, 500, 503, +506, 256, 78, 509, 512, 515, 518, 521, 524, 114, 527, 108, 99, 530, 533, 536, +539, 256, 110, 542, 545, 548, 551, 554, 557, 250, 226, 227, 201, 160, 224, 228, +220, 212, 213, 210, 211, 165, 209, 208, 170, 221, 255, 249, 172, 254, 181, 252, +253, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, +256, 256, 256, 256, 256, 185, 256, 256, 256, 256, 256, 189, 256, 176, 256, 256, +256, 256, 179, 178, 256, 256, 197, 256, 195, 110, 256, 256, 246, 256, 256, 560, +563, 566, 569, 69, 101, 173, 103, 572, 575, 578, 581, 584, 182, 183, 587, 590, +593, 596, 198, 599, 215, 602, 605, 608, 611, 614, 617, 620, 623, 626, 629, 256, +217, 278, 73, 632, 256, 281, 206, 256, 207, 256, 256, 256, 256, 256, 184, 186, +196, 218, 222, 223, 245, 247, 248, 251, }, }; @@ -756,6 +955,10 @@ static unsigned char string_table[] = { 2, 65, 69, 2, 97, 101, 2, 84, 77, +2, 73, 74, +2, 105, 106, +2, 102, 105, +2, 102, 108, 2, 73, 168, 2, 105, 168, 2, 121, 168, @@ -772,6 +975,9 @@ static unsigned char string_table[] = { 2, 117, 178, 2, 107, 184, 2, 71, 184, +2, 71, 162, +2, 89, 168, +2, 103, 162, 2, 65, 222, 2, 69, 222, 2, 73, 222, @@ -796,9 +1002,75 @@ static unsigned char string_table[] = { 2, 117, 242, 2, 107, 247, 2, 71, 247, +2, 71, 244, +2, 89, 249, +2, 103, 244, 2, 69, 172, 2, 73, 172, 2, 101, 172, 2, 105, 172, 2, 121, 172, +2, 89, 172, +3, 49, 218, 52, +3, 49, 218, 50, +3, 51, 218, 52, +2, 65, 254, +2, 76, 255, +2, 83, 255, +2, 83, 252, +2, 84, 255, +2, 90, 255, +2, 97, 254, +2, 108, 255, +2, 115, 255, +2, 115, 252, +2, 116, 255, +2, 122, 255, +2, 65, 249, +2, 67, 255, +2, 69, 254, +2, 69, 255, +2, 68, 255, +2, 78, 255, +2, 79, 253, +2, 82, 255, +2, 85, 251, +2, 85, 253, +2, 84, 252, +2, 97, 249, +2, 99, 255, +2, 101, 254, +2, 101, 255, +2, 100, 255, +2, 110, 255, +2, 111, 253, +2, 114, 255, +2, 117, 251, +2, 117, 253, +2, 116, 252, +2, 65, 248, +2, 97, 248, +2, 69, 248, +2, 101, 248, +2, 73, 254, +2, 105, 254, +2, 73, 248, +2, 105, 248, +2, 75, 252, +2, 76, 252, +2, 108, 252, +2, 78, 252, +2, 110, 252, +2, 79, 248, +2, 111, 248, +2, 82, 252, +2, 114, 252, +2, 85, 248, +2, 117, 248, +2, 85, 254, +2, 117, 254, +2, 107, 252, +2, 71, 252, +2, 71, 249, +2, 103, 249, }; diff --git a/charset/misc/chartable.in b/charset/misc/chartable.in index 4340fc7f..e67e9d55 100644 --- a/charset/misc/chartable.in +++ b/charset/misc/chartable.in @@ -9,6 +9,6 @@ set/kamen-ctrl set/koi8 set/pc-latin-2 set/macce -#set/cork -#set/ibm-ctrl -#set/mac +set/cork +set/ibm-ctrl +set/mac diff --git a/charset/misc/cstocs-names b/charset/misc/cstocs-names deleted file mode 100644 index 5a53022f..00000000 --- a/charset/misc/cstocs-names +++ /dev/null @@ -1,252 +0,0 @@ -AE 00C6 -Aabovedot 01E0 -Aacute 00C1 -Abreve 0102 -Acircumflex 00C2 -Adiaeresis 00C4 -Agrave 00C0 -Amacron 0100 -Aogonek 0104 -Aring 00C5 -Atilde 00C3 -CH F000 -Cacute 0106 -Ccaron 010C -Ccedilla 00C7 -Dcaron 010E -Delta 0394 -Eabovedot 0116 -Eacute 00C9 -Ecaron 011A -Ecircumflex 00CA -Ediaeresis 00CB -Egrave 00C8 -Emacron 0112 -Eng 014A -Eogonek 0118 -Eth 00D0 -Gamma 0194 -Gbreve 011E -Gcedilla 0122 -IJ 0132 -Iabovedot 0130 -Iacute 00CD -Icircumflex 00CE -Idiaeresis 00CF -Igrave 00CC -Imacron 012A -Iogonek 012E -Kcedilla 0136 -Lacute 0139 -Lcaron 013D -Lcedilla 013B -Lstroke 0141 -Nacute 0143 -Ncaron 0147 -Ncedilla 0145 -Ntilde 00D1 -OE 0152 -Oacute 00D3 -Ocircumflex 00D4 -Odiaeresis 00D6 -Odoubleacute 0150 -Ograve 00D2 -Omacron 014C -Omega 03A9 -Ostroke 00D8 -Otilde 00D5 -Phi 03A6 -Pt 20A7 -Racute 0154 -Rcaron 0158 -Rcedilla 0156 -Sacute 015A -Scaron 0160 -Scedilla 015E -Sigma 03A3 -Ssharp F0DF -Tcaron 0164 -Tcedilla 0162 -Theta 0398 -Thorn 00DE -Uacute 00DA -Ucircumflex 00DB -Udiaeresis 00DC -Udoubleacute 0170 -Ugrave 00D9 -Umacron 016A -Uogonek 0172 -Uring 016E -Yacute 00DD -Ydiaeresis 0178 -Zabovedot 017B -Zacute 0179 -Zcaron 017D -aabovedot 01E1 -aacute 00E1 -abovedot 02D9 -abreve 0103 -acircumflex 00E2 -acute 00B4 -adiaeresis 00E4 -ae 00E6 -agrave 00E0 -almostequal 2248 -alpha 03B1 -amacron 0101 -anglequoteleftsingle 2039 -anglequoterightsingle 203A -aogonek 0105 -aring 00E5 -atilde 00E3 -aunderscore 00AA -beta 03B2 -breve 0306 -brokenbar 00A6 -bullet 2022 -cacute 0107 -caron 030C -ccaron 010D -ccedilla 00E7 -cedilla 0327 -cent 00A2 -ch F002 -circumflex 0302 -copyright 00A9 -currency 00A4 -dagger 2020 -dcaron 010F -degree 00B0 -delta 03B4 -diaeresis 0308 -diamond 22C4 -division 00F7 -doubleacute 030B -doubledagger 2021 -eabovedot 0117 -eacute 00E9 -ecaron 011B -ecircumflex 00EA -ediaeresis 00EB -egrave 00E8 -emacron 0113 -emdash 2014 -endash 2013 -eng 014B -eogonek 0119 -equiv 224D -eth 00F0 -exclamdown 00A1 -fi FB01 -fl FB02 -forte 0192 -fraction 2044 -gacute 01F5 -gbreve 011F -greaterequal 2265 -guilder F003 -guillemotleft 00AB -guillemotright 00BB -guilletmotleft 00AB -guilletmotright 00BB -hyphen 00AD -iacute 00ED -icircumflex 00EE -idiaeresis 00EF -idotless 0131 -igrave 00EC -ij 0133 -imacron 012B -in 2208 -infinity 221E -integral 222B -intersection 2229 -iogonek 012F -kcedilla 0137 -lacute 013A -lcaron 013E -lcedilla 013C -lowerequal 2264 -lstroke 0142 -macron 0304 -masculine 00BA -middledot 00B7 -mu 03BC -multiply 00D7 -nacute 0144 -ncaron 0148 -ncedilla 0146 -nobreakspace 00A0 -notequal 2260 -notsign 00AC -nproduct 220F -nsummation 2211 -ntilde 00F1 -oacute 00F3 -ocircumflex 00F4 -odiaeresis 00F6 -odoubleacute 0151 -oe 0153 -ogonek 0328 -ograve 00F2 -omacron 014D -omega 03C9 -onehalf 00BD -onequarter 00BC -onesuperior 00B9 -ordfeminine 00AA -ostroke 00F8 -otilde 00F5 -ounderscore 00BA -paragraph 00B6 -partaildifferential 2202 -period3 0EAF -periodcentered 00B7 -permille 2030 -phi 03C6 -pi 03C0 -plusminus 00B1 -pound 00A3 -questiondown 00BF -quoteleftdouble 201C -quoteleftsingle 2018 -quotelowdouble 201E -quotelowsingle 201A -quoterightdouble 201D -quoterightsingle 2019 -racute 0155 -rcaron 0159 -rcedilla 0157 -registered 00AE -reversenotsign 2310 -ring 030A -sacute 015B -scaron 0161 -scedilla 015F -section 00A7 -sigma 03C3 -squareroot 221A -ssharp 00DF -tau 03C4 -tcaron 0165 -tcedilla 0163 -thorn 00FE -threequarters 00BE -threesuperior 00B3 -tilde 0303 -trademark 2122 -twosuperior 00B2 -uacute 00FA -ucircumflex 00FB -udiaeresis 00FC -udoubleacute 0171 -ugrave 00F9 -umacron 016B -uogonek 0173 -uring 016F -yacute 00FD -ydiaeresis 00FF -yen 00A5 -zabovedot 017C -zacute 017A -zcaron 017E diff --git a/charset/misc/enc2table b/charset/misc/enc2table deleted file mode 100644 index 3348de21..00000000 --- a/charset/misc/enc2table +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/perl -# -# Convert ".enc" file from the CStoCS package to UCS-2 character mapping -# (c) 1997 Martin Mares -# - -open (MAP, "cstocs-names") || die "No charname file"; -while () { - chop; - ($c,$uni) = split /[ \t]+/; -# if (defined $um{$uni}) { print "Warning: $uni redefined\n"; } - $um{$uni} = $c; - $code{$c} = $uni; -} -close MAP; - -while (<>) { - chop; - ($_,$c,$name) = split /[\t ]+/; - if ($c >= 128) { - if (!defined $code{$name}) { die "$name unknown"; } - $u{$c} = $code{$name}; - } -} - -for ($i=0; $i<256; $i++) { - $v = (defined $u{$i}) ? $u{$i} : ($i < 128 ? sprintf("%04X", $i) : "FFFD"); - printf "%02X\t%s\n", $i, $v; -} diff --git a/charset/misc/generate b/charset/misc/generate new file mode 100644 index 00000000..ac22d301 --- /dev/null +++ b/charset/misc/generate @@ -0,0 +1,14 @@ +#!/bin/sh +# Generate all data files for the charset conversion library +# (c) 2001 Martin Mares + +set -ex +rm -f U-*.h chartable.h misc/u-* +chmod +x misc/{unisplit,tabgen,mkunacc,table2h} +misc/unisplit +misc/table2h _U_cat byte U-cat.h +misc/table2h _U_lower word U-lower.h +misc/table2h _U_upper word U-upper.h +misc/mkunacc >misc/u-unacc +misc/table2h _U_unaccent word U-unacc.h +misc/tabgen chartable.h diff --git a/charset/misc/mksig b/charset/misc/mksig deleted file mode 100644 index f718f216..00000000 --- a/charset/misc/mksig +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/perl -# -# Create Word Signature Table -# (c) 1997 Martin Mares -# - -open (U, "misc/u-upper") || die "No uppercase map"; -while () { - chomp; - /^(....)\t0x(....)$/ || die "Syntax error"; - $upper{$1} = $2; -} -close U; - -open (U, "misc/u-unacc") || die "No unaccent map"; -while () { - chomp; - /^(....)\t0x(....)$/ || die "Syntax error"; - $unacc{$1} = $2; -} -close U; - -open (U, "set/sig") || die "No signature set"; -while () { - chomp; - /^(..)\t(....)\t/ || next; - $sigset{$2} = $1; -} -close U; - -open (U, "misc/u-cat") || die "No category map"; -while () { - chomp; - /^(....)\t/ || die "Syntax error"; - $from = $1; - /_C_(UPPER|LOWER)/ || next; - $to = (defined $upper{$from}) ? $upper{$from} : $from; - $to = (defined $unacc{$to}) ? $unacc{$to} : $to; - if (defined $sigset{$to}) { print "$from\t0x$sigset{$to}\n"; } -} diff --git a/charset/misc/mkunacc b/charset/misc/mkunacc index e8f9528f..8853b7e5 100644 --- a/charset/misc/mkunacc +++ b/charset/misc/mkunacc @@ -4,7 +4,7 @@ # (c) 1997 Martin Mares # -open (UNI, "/tmp/unicode") || die "No Unicode Data File"; +open (UNI, "unicode/UnicodeData.txt") || die "No Unicode Data File"; while () { chomp; ($num,$name,$cat,$_,$_,$exp) = split /;/; @@ -13,10 +13,11 @@ while () { } close UNI; -open (UNI, "/tmp/unicode") || die "No Unicode Data File"; +open (UNI, "unicode/UnicodeData.txt") || die "No Unicode Data File"; while () { chomp; ($num,$name,$cat,$_,$_,$exp) = split /;/; + $num =~ /^....$/ || next; if ($exp ne "") { $exp =~ s/^<.*> *//g; $good = 1; diff --git a/charset/misc/tabgen b/charset/misc/tabgen index 076128a1..28660d1d 100755 --- a/charset/misc/tabgen +++ b/charset/misc/tabgen @@ -93,7 +93,7 @@ for($i=0; $i<256; $i++) { print "};\n\n"; print STDERR "UniData file...\n"; -open (U, "/tmp/unicode") || die "No UnicodeData file"; +open (U, "unicode/UnicodeData.txt") || die "No UnicodeData file"; while () { chomp; ($num,$name,$_,$_,$_,$exp) = split /;/; diff --git a/charset/misc/gentab b/charset/misc/table2h old mode 100644 new mode 100755 similarity index 100% rename from charset/misc/gentab rename to charset/misc/table2h diff --git a/charset/misc/unisplit b/charset/misc/unisplit index 0fdc4b3b..3c90637c 100644 --- a/charset/misc/unisplit +++ b/charset/misc/unisplit @@ -1,17 +1,18 @@ #!/usr/bin/perl # # Split Unicode Data File -# (c) 1997 Martin Mares +# (c) 1997--2001 Martin Mares # -open(I, "/tmp/unicode") || die "Unable to open UniCode data file"; +open(I, "unicode/UnicodeData.txt") || die "Unable to open UniCode data file"; open(C, ">misc/u-cat") || die "cat file open"; open(U, ">misc/u-upper") || die "upper file open"; open(L, ">misc/u-lower") || die "lower file open"; while () { chomp; (/^$/ || /^#/) && next; - ($code,$name,$cat,$comb,$bidir,$decomp,$d0,$d1,$d2,$n0,$mirr,$cmt2,$upper,$lower,$title) = split /;/; + ($code,$name,$cat,$comb,$bidir,$decomp,$d0,$d1,$n0,$mirr,$cmt1,$cmt2,$upper,$lower,$title) = split /;/; + $code =~ /^....$/ || next; if ($cat =~ /^C/) { $ccat = "_C_CTRL"; } elsif ($cat =~ /^Z/) { $ccat = "_C_BLANK"; } elsif ($cat =~ /^Ll/) { $ccat = "_C_LOWER"; } diff --git a/charset/tosig.c b/charset/tosig.c deleted file mode 100644 index 3cece27d..00000000 --- a/charset/tosig.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * The UniCode Library -- Signaturing Table - * - * (c) 1997 Martin Mares - */ - -#include "lib/lib.h" -#include "charset/unicode.h" -#include "charset/U-sig.h" diff --git a/charset/unicode.h b/charset/unicode.h index 61617c08..50d4ed77 100644 --- a/charset/unicode.h +++ b/charset/unicode.h @@ -9,7 +9,7 @@ #include "lib/chartype.h" -extern byte *_U_cat[], *_U_sig[]; +extern byte *_U_cat[]; extern word *_U_upper[], *_U_lower[], *_U_unaccent[]; static inline uns Ucategory(word x) @@ -38,14 +38,6 @@ static inline word Uunaccent(word x) return w ? w : x; } -static inline byte Usig(word x) -{ - if (_U_sig[x >> 8U]) - return _U_sig[x >> 8U][x & 0xff] ? : 0xff; - else - return 0xff; -} - #define UCat(x,y) (Ucategory(x) & (y)) #define Uupper(x) UCat(x, _C_UPPER) -- 2.39.2