From 9cb395b9f484994f9769e2f1ef800fa3a6f97561 Mon Sep 17 00:00:00 2001
From: Deron Johnson <deron.johnson@sun.com>
Date: Thu, 17 Feb 2005 22:44:26 +0000
Subject: Joined with branch XORG-6_8_2.

---
 large/big5.eten-0.enc   |  2 +-
 large/big5hkscs-0.enc   |  6 +++---
 large/gb18030-0.enc     | 10 ----------
 large/gb2312.1980-0.enc |  4 ++--
 4 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 large/gb18030-0.enc

diff --git a/large/big5.eten-0.enc b/large/big5.eten-0.enc
index 725769b..f9b0352 100644
--- a/large/big5.eten-0.enc
+++ b/large/big5.eten-0.enc
@@ -4,7 +4,7 @@ ALIAS big5.cp950-0
 # This file is generated from glibc-2.2 BIG5 charmap
 # $XFree86: xc/fonts/encodings/large/big5.eten-0.enc,v 1.5 2001/09/26 12:48:19 alanh Exp $
 SIZE 0xFA 0xFF
-FIRSTINDEX 0xA1 0x40
+FIRSTINDEX 0xA0 0x40
 STARTMAPPING unicode
 UNDEFINE 0x0000 0xF9FE
 0xA140  0x3000
diff --git a/large/big5hkscs-0.enc b/large/big5hkscs-0.enc
index 7fd1e03..99610ca 100644
--- a/large/big5hkscs-0.enc
+++ b/large/big5hkscs-0.enc
@@ -3,9 +3,9 @@ STARTENCODING big5hkscs-0
 # http://www.thizlinux.com/~anthony/hkscs/Correct-Big5HKSCS-to-Unicode-by-b5.txt
 # by Jungshik Shin <jshin@mailaps.org>
 # $XFree86: xc/fonts/encodings/large/big5hkscs-0.enc,v 1.1 2003/08/26 11:34:53 eich Exp $
-# $XdotOrg: xc/fonts/encodings/large/big5hkscs-0.enc,v 1.2 2004/04/23 18:43:03 eich Exp $
-SIZE 0xFF 0xFF
-FIRSTINDEX 0x81 0x40
+# $XdotOrg$
+SIZE 0xFf 0xFF
+FIRSTINDEX 0x80 0x40
 STARTMAPPING unicode
 UNDEFINE 0x0000 0xFEFE
 0x8140  0x817E  0xEEB8
diff --git a/large/gb18030-0.enc b/large/gb18030-0.enc
deleted file mode 100644
index 3fd646f..0000000
--- a/large/gb18030-0.enc
+++ /dev/null
@@ -1,10 +0,0 @@
-STARTENCODING gb18030-0
-SIZE 0x100 0x100
-STARTMAPPING unicode
-UNDEFINE 0x80 0xFFFF
-0x80  0xFFFF  0x80
-ENDMAPPING
-STARTMAPPING cmap 3 4
-# the identity mapping
-ENDMAPPING
-ENDENCODING
diff --git a/large/gb2312.1980-0.enc b/large/gb2312.1980-0.enc
index 337a3a5..80d1e15 100644
--- a/large/gb2312.1980-0.enc
+++ b/large/gb2312.1980-0.enc
@@ -1,6 +1,6 @@
 STARTENCODING gb2312.1980-0
 # $XFree86$
-SIZE 0x78 0x7F
+SIZE 0x78 0x80
 FIRSTINDEX 0x20 0x20
 STARTMAPPING unicode
 UNDEFINE 0 0x777F
@@ -13,7 +13,7 @@ UNDEFINE 0 0x777F
 0x2129  0x3005
 0x212A  0x2014
 0x212B  0xFF5E
-0x212C  0x2016
+0x212C  0x2225
 0x212D  0x2026
 0x212E  0x212F  0x2018
 0x2130  0x2131  0x201C
-- 
cgit v1.2.3