Commit 978cb1e8 authored by dawes's avatar dawes
Browse files

Import of XFree86 4.0.1g

parent 13783196
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.83 2000/11/09 01:35:05 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.84 2000/11/28 16:10:21 dawes Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -629,12 +629,15 @@ TCLIBDIR = TclLibDir
#define AlternateUsrLibDir YES
#endif
#endif
#ifndef VarLibDir
#ifndef VarDirectory
#ifdef ProjectVar
#define VarLibDir Concat(ProjectVar,/lib)
#define VarDirectory ProjectVar
#else
#define VarLibDir /var/lib
#define VarDirectory /var
#endif
#endif
#ifndef VarLibDir
#define VarLibDir $(VARDIR)/lib
#endif
/*
......@@ -728,7 +731,7 @@ TCLIBDIR = TclLibDir
#ifndef LogDirectory
#if HasVarDirectory
#define LogDirectory /var/log
#define LogDirectory $(VARDIR)/log
#else
#define LogDirectory /usr/adm
#endif
......@@ -740,7 +743,7 @@ TCLIBDIR = TclLibDir
#ifndef VarRunDirectory
#if HasVarRun
#define VarRunDirectory /var/run
#define VarRunDirectory $(VARDIR)/run
#endif
#endif
......@@ -750,7 +753,7 @@ TCLIBDIR = TclLibDir
#ifndef VarDbDirectory
#if HasVarDb
#define VarDbDirectory /var/db
#define VarDbDirectory $(VARDIR)/db
#endif
#endif
......@@ -1361,6 +1364,7 @@ TCLIBDIR = TclLibDir
INCROOT = IncRoot /* base of where to put header files */
USRLIBDIR = UsrLibDir /* nonshared libraries */
VARDIR = VarDirectory /* usually /var */
VARLIBDIR = VarLibDir /* xdm runtime files */
SYSTEMUSRLIBDIR = SystemUsrLibDir /* system's "/usr/lib" */
SYSTEMUSRINCDIR = SystemUsrIncDir /* system's "/usr/include" */
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.81 2000/11/14 00:07:00 dawes Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.82 2000/11/28 16:10:21 dawes Exp $
/***************************************************************************
* *
......@@ -1024,9 +1024,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef XPrintDir
#define XPrintDir ServerConfigDir
#endif
#ifndef VarDirectory
#define VarDirectory /var/X11
#endif
#ifndef EtcX11Directory
#define EtcX11Directory /etc/X11
#endif
......@@ -1128,9 +1125,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
MODULEDIR = ModuleDir
TOP_X_INCLUDES = TopXInclude
#ifdef VarDirectory
VARDIR = VarDirectory
#endif
#ifdef EtcX11Directory
ETCX11DIR = EtcX11Directory
#endif
......
XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.1 2000/11/02 02:51:06 dawes Exp $
XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $
/* Darwin / MacOS-X configuration by John Carmack <johnc@idsoftware.com> */
......@@ -52,9 +52,10 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.1 2000/11/02 02:51:06 dawes Exp $
#if XFree86Devel
# define DefaultCCOptions -Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wredundant-decls -Wnested-externs
-Wredundant-decls -Wnested-externs \
-traditional-cpp
#else
# define DefaultCCOptions -Wall -Wpointer-arith
# define DefaultCCOptions -Wall -Wpointer-arith -traditional-cpp
#endif
/* a lot of xfree86 code needs __powerpc__ to avoid doing outport asm
......
XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.8 2000/11/14 18:20:31 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.9 2000/11/28 16:10:22 dawes Exp $
#ifndef OSName
#define OSName DefaultOSName
......@@ -123,7 +123,7 @@ XCOMM Not implemented and will always fail.
#define StandardCppDefines StandardDefines
#define HasVarRun YES
#define VarDbDirectory /var/state
#define VarDbDirectory $(VARDIR)/state
XCOMM i386Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt
......
......@@ -4,10 +4,10 @@ XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.143 2000/11/14 23:58:30 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.146 2000/11/29 17:40:19 dawes Exp $
#ifndef LinuxElfDefault
# define LinuxElfDefault YES
# define LinuxElfDefault YES
#endif
#ifndef UseElfFormat
......@@ -43,7 +43,7 @@ XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.143 2000/11/14 23:58:30 daw
# define OSTeenyVersion DefaultOSTeenyVersion
#endif
#ifndef LinuxDistribution
#ifndef LinuxDistribution
# define LinuxDistribution DefaultLinuxDistribution
/*
Add "#define LinuxDistribution Linux<mumble>" to your site.def or host.def.
......@@ -86,6 +86,55 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
XCOMM binutils: (LinuxBinUtilsMajorVersion)
#if LinuxDistribution == LinuxDebian
#define XFree86Devel YES
#define HasTk YES
#define TkLibDir /usr/lib
#define TkIncDir /usr/include
#define TkLibName tk8.3
#define XF86SetupUsesStaticTk NO
#define HasTcl YES
#define TclLibDir /usr/lib
#define TclIncDir /usr/include
#define TclLibName tcl8.3
#define XF86SetupUsesStaticTcl NO
#if 0
#define XInputDrivers mouse dynapro elo2300 elographics magellan microtouch \
mutouch spaceorb wacom void
#endif
/* un-comment this when it is un-broken */
/* #define JoystickSupport YES */
#define InstallXinitConfig YES
#define InstallXdmConfig YES
#define InstallFSConfig YES
#define HasXdmAuth YES
#define DebuggableLibraries YES
#define ForceNormalLib YES
#define BuildSpecsDocs YES
#define SpecsDocDirs GL Xext Xv xterm
/* right now glide only works on i386 */
#ifdef i386Architecture
# define HasGlide2 YES
# define Glide2IncDir /usr/include/glide
# define HasGlide3 YES
# define Glide3IncDir /usr/include/glide3
#endif
#define XAppLoadDir EtcX11Directory/app-defaults
#define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
#define BuilderEMailAddr "submit@bugs.debian.org"
#define SharedLibXdmGreet YES
#define LinkGLToUsrInclude NO
#define LinkGLToUsrLib NO
#define SharedLibFont NO
#define SharedLibXft NO
#define SharedLibXrender NO
#define HasZlib YES
#define SharedLibGlu YES
#define NormalLibGlu YES
#define BuildRman NO
#define BuildHtmlManPages NO
#endif
/*
* The Linux BinUtils major version. 25 => 2.5.x, which is what is included
* with Slackware 3.0
......@@ -103,9 +152,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define LinuxLocaleDefines -DX_LOCALE
#endif
#if LinuxDistribution == LinuxDebian
# define LinuxAdditionalIncludes -I/usr/src/linux/include
#else
#ifndef LinuxAdditionalIncludes
# define LinuxAdditionalIncludes /**/
#endif
......@@ -150,7 +197,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifndef HasMTRRSupport
# ifdef i386Architecture
/* There is no certain way to know if <asm/mtrr.h> is available,
but it made it into kernel 2.2, so... */
but it made it into kernel 2.2, so... */
# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
# define HasMTRRSupport YES
# else
......@@ -163,9 +210,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifndef XF86INT10_BUILD
# ifdef i386Architecture
# define XF86INT10_BUILD X86VM
# define XF86INT10_BUILD X86VM
# else
# define XF86INT10_BUILD X86EMU_GENERIC
# define XF86INT10_BUILD X86EMU_GENERIC
# endif
#endif
......@@ -174,16 +221,18 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifndef BuildXF86DRI
# if defined(i386Architecture) || defined(ia64Architecture)
# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
# define BuildXF86DRI YES
# define BuildXF86DRI YES
# else
# define BuildXF86DRI NO
# define BuildXF86DRI NO
# endif
# elif defined(SparcArchitecture)
# define BuildXF86DRI YES
# define BuildXF86DRI YES
# elif defined(AlphaArchitecture)
# define BuildXF86DRI YES
# define BuildXF86DRI YES
# elif defined(PpcArchitecture)
# define BuildXF86DRI YES
# else
# define BuildXF86DRI NO
# define BuildXF86DRI NO
# endif
#endif
......@@ -197,22 +246,22 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# if OSMajorVersion == 2
/* Only tested for Linux 2.2.0 through 2.2.12 */
# if OSMinorVersion == 2 && OSTeenyVersion <= 12
# define BuildXF86DRM YES
# define BuildXF86DRM YES
# else
/* Only tested for Linux 2.3.0 through 2.3.18 */
# if OSMinorVersion == 3 && OSTeenyVersion <= 18
# define BuildXF86DRM YES
# define BuildXF86DRM YES
# else
/* Note: add more conditions when 2.4.x and 2.5.x are released */
# define BuildXF86DRM NO
# define BuildXF86DRM NO
# endif
# endif
# else
/* Note: add more conditions when 3.0.x and 3.1.x are released */
# define BuildXF86DRM NO
# define BuildXF86DRM NO
# endif
# else
# define BuildXF86DRM NO
# define BuildXF86DRM NO
# endif
#endif
......@@ -220,9 +269,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# if defined(i386Architecture) || defined(ia64Architecture)
/* The AGPGART header file is included in os-support/linux, which
allows all drivers that depend on AGP to build properly. */
# define HasAgpGart YES
# define HasAgpGart YES
# else
# define HasAgpGart NO
# define HasAgpGart NO
# endif
#endif
......@@ -316,10 +365,10 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# if UseElfFormat
# ifdef MipsArchitecture
# ifndef AsCmd
# define AsCmd gcc -c -x assembler-with-cpp
# define AsCmd gcc -c -x assembler-with-cpp
# endif
# ifndef DoLoadableServer
# define DoLoadableServer NO
# define DoLoadableServer NO
# endif
# endif /* MipsArchitecure */
# ifndef CcCmd
......@@ -365,7 +414,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif /* AlphaArchitecture */
# ifdef ia64Architecture
# define CcCmd gcc
# define CplusplusCmd g++
# define CplusplusCmd g++
# define AsCmd as
# define LdCmd ld
# define AsmDefines -DUSE_GAS -U__ELF__
......@@ -395,11 +444,11 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define CplusplusCmd c++ -b alpha-linux
# endif /* AlphaArchitecture */
# ifdef ia64Architecture
# define CcCmd gcc
# define CplusplusCmd g++
# define AsCmd as
# define LdCmd ld
# define AsmDefines -D__ELF__
# define CcCmd gcc
# define CplusplusCmd g++
# define AsCmd as
# define LdCmd ld
# define AsmDefines -D__ELF__
# endif /* ia64Architecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
......@@ -445,28 +494,29 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define StandardCppDefines StandardDefines
#define HasVarRun YES
#define VarDbDirectory /var/lib
#define VarDbDirectory $(VARDIR)/lib
#ifndef XF86OSCardDrivers
# define XF86OSCardDrivers v4l
#endif
#if UseElfFormat
# define HasPlugin YES
# define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
#endif
#ifdef i386Architecture
# define OptimizedCDebugFlags DefaultGcc2i386Opt
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
# if UseElfFormat
# define HasPlugin YES
# define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
# endif
#endif /* i386Architecture */
#ifdef s390Architecture
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__s390__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__s390__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* s390Architecture */
#ifdef AlphaArchitecture
......@@ -490,12 +540,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifdef ia64Architecture
# define OptimizedCDebugFlags -O2
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#if UseElfFormat
#define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
#endif
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* ia64Architecture */
#ifdef Mc68020Architecture
......@@ -533,7 +579,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif
#endif
#ifndef StandardDefines
# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
......@@ -583,7 +629,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#endif
#ifndef LinkGLToUsrLib
# define LinkGLToUsrLib YES
# define LinkGLToUsrLib YES
#endif
# ifndef LinkGLToUsrInclude
# define LinkGLToUsrInclude YES
......@@ -601,7 +647,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#ifdef S390Architecture
# define HasXServer NO
# define HasXServer NO
#endif
#include <lnxLib.rules>
......
XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $
XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.40 2000/06/17 01:40:39 dawes Exp $
XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.41 2000/11/28 16:10:23 dawes Exp $
/*
* A default OS name
*/
......@@ -143,7 +143,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.40 2000/06/17 01:40:39 dawes Exp $
#endif
#endif
#ifndef LogDirectory
#define LogDirectory /var/adm
#define LogDirectory $(VARDIR)/adm
#endif
#endif
......
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.166 2000/11/14 17:32:54 dawes Exp $
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.167 2000/11/28 20:59:12 dawes Exp $
/******************************************************************************/
/*
* This file is to provide a quick method for most people to change the
......@@ -256,6 +256,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.166 2000/11/14 17:32:54 dawes Exp
cirrus tseng trident chips apm \
GlideDriver fbdev i128 \
ati AgpGartDrivers DevelDrivers ark cyrix \
siliconmotion \
vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
*/
......
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.325 2000/11/14 17:32:54 dawes Exp $
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.328 2000/11/29 15:51:18 dawes Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
......@@ -178,6 +178,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
cirrus tseng trident chips apm \
GlideDriver fbdev i128 \
ati AgpGartDrivers DevelDrivers ark cyrix \
siliconmotion \
vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
# endif
#endif
......@@ -363,7 +364,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
/* Pure PCI drivers should go first */
# ifndef XF86CardDrivers
# define XF86CardDrivers mga tdfx glint s3virge rendition tga \
nv DevelDrivers vga \
nv DevelDrivers siliconmotion vga \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
#endif
......
......@@ -8,7 +8,7 @@
* be passed to the template file. *
* *
***************************************************************************/
/* $XFree86: xc/config/imake/imake.c,v 3.38 2000/11/14 18:20:32 dawes Exp $ */
/* $XFree86: xc/config/imake/imake.c,v 3.40 2000/11/27 05:06:43 dawes Exp $ */
/*
*
......@@ -994,13 +994,23 @@ get_distrib(FILE *inFile)
static void
get_libc_version(FILE *inFile)
{
char *aout = tmpnam (NULL);
char aout[] = "/tmp/imakeXXXXXX";
FILE *fp;
const char *format = "%s -o %s -x c -";
char *cc;
int len;
char *command;
/* Pre-create temp file safely */
{
/* Linux + ELF has mkstemp() */
int tmpfd;
if ((tmpfd = mkstemp(aout)) == -1) {
perror("mkstemp");
abort();
}
close(tmpfd);
}
cc = getenv ("CC");
if (cc == NULL)
cc = "gcc";
......@@ -1190,7 +1200,7 @@ define_os_defaults(FILE *inFile)
{
#if !defined(WIN32) && !defined(__EMX__)
#if (defined(DEFAULT_OS_NAME) || defined(DEFAULT_OS_MAJOR_REV) || \
defined(DEFAULT_OS_MINOR_REV) || defined(DEFAUL_OS_TEENY_REV))
defined(DEFAULT_OS_MINOR_REV) || defined(DEFAULT_OS_TEENY_REV))
struct utsname name;
char buf[SYS_NMLN * 5 + 1];
......
/*
* Mesa 3-D graphics library
* Version: 3.3
* Version: 3.4
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
......@@ -590,7 +590,7 @@ static void TAG(shade_fast_rgba_single)( struct vertex_buffer *VB )
static void TAG(shade_fast_rgba)( struct vertex_buffer *VB )
{
GLcontext *ctx = VB->ctx;
GLfloat base[2][3];
GLfloat (*base)[3] = ctx->Light.BaseColor;
GLubyte *sumA = ctx->Light.BaseAlpha;
GLuint nstride = VB->NormalPtr->stride;
const GLfloat *normal = VB->NormalPtr->start;
......@@ -681,7 +681,6 @@ static void TAG(shade_fast_rgba)( struct vertex_buffer *VB )
light->MatSpecular[side]);
}
}
if (LIGHT_FRONT(*mask)) {
FLOAT_RGB_TO_UBYTE_RGB( Fcolor[j], sum[0] );
Fcolor[j][3] = sumA[0];
......@@ -710,10 +709,10 @@ static void TAG(shade_fast_rgba)( struct vertex_buffer *VB )
NEXT_NORMAL;
}
if ( flags[j] & cm_flags )
if ( flags[j] & cm_flags )
gl_update_color_material( ctx, CMcolor[j] );
if ( flags[j] & VERT_MATERIAL )
if ( flags[j] & VERT_MATERIAL )
gl_update_material( ctx, new_material[j], new_material_mask[j] );
} while (!(flags[j] & VERT_END_VB));
......
......@@ -33,6 +33,7 @@ Notice===
This table data derived from Unicode, Inc.
(ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/OTHER/BIG5.TXT)
*/
/* $XFree86: xc/extras/X-TrueType/BIG5/BIG5toUCS2.c,v 1.4 2000/11/29 17:40:21 dawes Exp $ */
#include "xttversion.h"
......@@ -48,10 +49,10 @@ static char const * const releaseID =
static ucs2_t tblBig5ToUcs2[] = {
/* 0xA140 - 0xA1FF */
0x3000, 0xFF0C, 0x3001, 0x3002, 0xFF0E, 0x2022, 0xFF1B, 0xFF1A,
0xFF1F, 0xFF01, 0xFE30, 0x2026, 0x2025, 0xFE50, 0xFF64, 0xFE52,
0x3000, 0xFF0C, 0x3001, 0x3002, 0xFF0E, 0x2027, 0xFF1B, 0xFF1A,
0xFF1F, 0xFF01, 0xFE30, 0x2026, 0x2025, 0xFE50, 0xFE51, 0xFE52,
0x00B7, 0xFE54, 0xFE55, 0xFE56, 0xFE57, 0xFF5C, 0x2013, 0xFE31,
0x2014, 0xFE33, 0xFFFD, 0xFE34, 0xFE4F, 0xFF08, 0xFF09, 0xFE35,
0x2014, 0xFE33, 0x2574, 0xFE34, 0xFE4F, 0xFF08, 0xFF09, 0xFE35,
0xFE36, 0xFF5B, 0xFF5D, 0xFE37, 0xFE38, 0x3014, 0x3015, 0xFE39,
0xFE3A, 0x3010, 0x3011, 0xFE3B, 0xFE3C, 0x300A, 0x300B, 0xFE3D,
0xFE3E, 0x3008, 0x3009, 0xFE3F, 0xFE40, 0x300C, 0x300D, 0xFE41,
......@@ -64,16 +65,16 @@ static ucs2_t tblBig5ToUcs2[] = {
0x201D, 0x301D, 0x301E, 0x2035, 0x2032, 0xFF03, 0xFF06, 0xFF0A,
0x203B, 0x00A7, 0x3003, 0x25CB, 0x25CF, 0x25B3, 0x25B2, 0x25CE,
0x2606, 0x2605, 0x25C7, 0x25C6, 0x25A1, 0x25A0, 0x25BD, 0x25BC,
0x32A3, 0x2105, 0x203E, 0xFFFD, 0xFF3F, 0xFFFD, 0xFE49, 0xFE4A,
0x32A3, 0x2105, 0x00AF, 0xFFE3, 0xFF3F, 0x02CD, 0xFE49, 0xFE4A,
0xFE4D, 0xFE4E, 0xFE4B, 0xFE4C, 0xFE5F, 0xFE60, 0xFE61, 0xFF0B,
0xFF0D, 0x00D7, 0x00F7, 0x00B1, 0x221A, 0xFF1C, 0xFF1E, 0xFF1D,
0x2266, 0x2267, 0x2260, 0x221E, 0x2252, 0x2261, 0xFE62, 0xFE63,
0xFE64, 0xFE65, 0xFE66, 0x223C, 0x2229, 0x222A, 0x22A5, 0x2220,
0xFE64, 0xFE65, 0xFE66, 0xFF5E, 0x2229, 0x222A, 0x22A5, 0x2220,
0x221F, 0x22BF, 0x33D2, 0x33D1, 0x222B, 0x222E, 0x2235, 0x2234,
0x2640, 0x2642, 0x2641, 0x2609, 0x2191, 0x2193, 0x2190, 0x2192,
0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFFFD, ALTCHR,
0x2640, 0x2642, 0x2295, 0x2299, 0x2191, 0x2193, 0x2190, 0x2192,
0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFF0F, ALTCHR,
/* 0xA240 - 0xA2FF */
0xFFFD, 0xFF0F, 0xFF3C, 0xFF04, 0x00A5, 0x3012, 0x00A2, 0x00A3,
0xFF3C, 0x2215, 0xFE68, 0xFF04, 0xFFE5, 0x3012, 0xFFE0, 0xFFE1,
0xFF05, 0xFF20, 0x2103, 0x2109, 0xFE69, 0xFE6A, 0xFE6B, 0x33D5,
0x339C, 0x339D, 0x339E, 0x33CE, 0x33A1, 0x338E, 0x338F, 0x33C4,
0x00B0, 0x5159, 0x515B, 0x515E, 0x515D, 0x5161, 0x5163, 0x55E7,
......@@ -90,7 +91,7 @@ static ucs2_t tblBig5ToUcs2[] = {
0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18,
0xFF19, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
0x2167, 0x2168, 0x2169, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025,
0x3026, 0x3027, 0x3028, 0x3029, 0xFFFD, 0x5344, 0xFFFD, 0xFF21,
0x3026, 0x3027, 0x3028, 0x3029, 0x5341, 0x5344, 0x5345, 0xFF21,
0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29,
0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31,
0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39,
......@@ -118,7 +119,7 @@ static ucs2_t tblBig5ToUcs2[] = {
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, 0x20AC, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
......@@ -985,68 +986,68 @@ static ucs2_t tblBig5ToUcs2[] = {
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR,
ALTCHR, 0x30FE, 0x309D, 0x309E, 0x3005, 0x3041, 0x3042, 0x3043,
0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, 0x304A, 0x304B,
0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, 0x3052, 0x3053,
0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305A, 0x305B,
0x305C, 0x305D, 0x305E, 0x305F, 0x3060, 0x3061, 0x3062, 0x3063,
0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306A, 0x306B,
0x306C, 0x306D, 0x306E, 0x306F, 0x3070, 0x3071, 0x3072, 0x3073,
0x3074, 0x3075, 0x3076, 0x3077, 0x3078, 0x3079, 0x307A, 0x307B,
0x307C, 0x307D, 0x307E, 0x307F, 0x3080, 0x3081, 0x3082, 0x3083,
0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, 0x308A, 0x308B,
0x308C, 0x308D, 0x308E, 0x308F, 0x3090, 0x3091, 0x3092, 0x3093,
0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, ALTCHR,
ALTCHR, 0xF6B1, 0xF6B2, 0xF6B3, 0xF6B4, 0xF6B5, 0xF6B6, 0xF6B7,
0xF6B8, 0xF6B9, 0xF6BA, 0xF6BB, 0xF6BC, 0xF6BD, 0xF6BE, 0xF6BF,
0xF6C0, 0xF6C1, 0xF6C2, 0xF6C3, 0xF6C4, 0xF6C5, 0xF6C6, 0xF6C7,
0xF6C8, 0xF6C9, 0xF6CA, 0xF6CB, 0xF6CC, 0xF6CD, 0xF6CE, 0xF6CF,
0xF6D0, 0xF6D1, 0xF6D2, 0xF6D3, 0xF6D4, 0xF6D5, 0xF6D6, 0xF6D7,
0xF6D8, 0xF6D9, 0xF6DA, 0xF6DB, 0xF6DC, 0xF6DD, 0xF6DE, 0xF6DF,
0xF6E0, 0xF6E1, 0xF6E2, 0xF6E3, 0xF6E4, 0xF6E5, 0xF6E6, 0xF6E7,
0xF6E8, 0xF6E9, 0xF6EA, 0xF6EB, 0xF6EC, 0xF6ED, 0xF6EE, 0xF6EF,
0xF6F0, 0xF6F1, 0xF6F2, 0xF6F3, 0xF6F4, 0xF6F5, 0xF6F6, 0xF6F7,
0xF6F8, 0xF6F9, 0xF6FA