Skip to content

N
nx-libs
Commit b4571a8f authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

update lcUniConv subdir to libX11 1.3.4

parent 687d44b6
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 34 deletions
nx-X11/lib/X11/lcUTF8.c
View file @ b4571a8f
......@@ -206,11 +206,13 @@ typedef struct {
} Summary16;
#include "lcUniConv/gb2312.h"
#include "lcUniConv/gbk.h"
#include "lcUniConv/jisx0208.h"
#include "lcUniConv/jisx0212.h"
#include "lcUniConv/ksc5601.h"
#include "lcUniConv/big5.h"
#include "lcUniConv/big5_emacs.h"
#include "lcUniConv/big5hkscs.h"
static Utf8ConvRec all_charsets[] = {
/* The ISO10646-1/UTF-8 entry occurs twice, once at the beginning
......
nx-X11/lib/X11/lcUniConv/big5_emacs.h
View file @ b4571a8f
/* $XFree86$ */
/*
* BIG5-0 and BIG5-1
......
nx-X11/lib/X11/lcUniConv/big5hkscs.h 0 → 100644
View file @ b4571a8f
This source diff could not be displayed because it is too large. You can view the blob instead.
nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c
View file @ b4571a8f
/* $XFree86$ */
/*
* Generates a CJK character set table from a .TXT table as found on
......@@ -18,6 +17,8 @@
* ./cjk_tab_to_h BIG5 big5 > big5.h < BIG5.TXT
*
* ./cjk_tab_to_h JOHAB johab > johab.h < JOHAB.TXT
*
* ./cjk_tab_to_h BIG5HKSCS-0 big5hkscs >big5hkscs.h < BIG5HKSCS.TXT
*/
#include <stdio.h>
......@@ -892,6 +893,49 @@ static void do_big5 (const char* name)
invert(&enc); output_uni2charset_sparse(name,&enc);
}
/* Big5-HKSCS specifics */
static int row_byte_big5hkscs (int row) {
return 0x81+row;
}
static int col_byte_big5hkscs (int col) {
return (col >= 0x3f ? 0x62 : 0x40) + col;
}
static int byte_row_big5hkscs (int byte) {
if (byte >= 0x81 && byte < 0xff)
return byte-0x81;
else
return -1;
}
static int byte_col_big5hkscs (int byte) {
if (byte >= 0x40 && byte < 0x7f)
return byte-0x40;
else if (byte >= 0xa1 && byte < 0xff)
return byte-0x62;
else
return -1;
}
static void do_big5hkscs (const char* name)
{
Encoding enc;
enc.rows = 126;
enc.cols = 157;
enc.row_byte = row_byte_big5hkscs;
enc.col_byte = col_byte_big5hkscs;
enc.byte_row = byte_row_big5hkscs;
enc.byte_col = byte_col_big5hkscs;
enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff";
enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0xa1 && %1$s < 0xff)";
enc.byte_row_expr = "%1$s - 0x81";
enc.byte_col_expr = "%1$s - (%1$s >= 0xa1 ? 0x62 : 0x40)";
read_table(&enc);
output_charset2uni(name,&enc);
invert(&enc); output_uni2charset_sparse(name,&enc);
}
/* Johab Hangul specifics */
static int row_byte_johab_hangul (int row) {
......@@ -1014,6 +1058,8 @@ int main (int argc, char *argv[])
do_ksc5601(name);
else if (!strcmp(name,"big5") || !strcmp(name,"cp950ext"))
do_big5(name);
else if (!strcmp(name,"big5hkscs"))
do_big5hkscs(name);
else if (!strcmp(name,"johab_hangul"))
do_johab_hangul(name);
else if (!strcmp(name,"cp932ext"))
......
nx-X11/lib/X11/lcUniConv/cp1133.h
View file @ b4571a8f
/* $XFree86$ */
/*
* IBM-CP1133
......
nx-X11/lib/X11/lcUniConv/gbk.h 0 → 100644
View file @ b4571a8f
This source diff could not be displayed because it is too large. You can view the blob instead.
nx-X11/lib/X11/lcUniConv/georgian_academy.h
View file @ b4571a8f
/* $XFree86$ */
/*
* GEORGIAN-ACADEMY
......
nx-X11/lib/X11/lcUniConv/iso8859_10.h
View file @ b4571a8f
/* $XFree86$ */
/*
* ISO-8859-10
......
nx-X11/lib/X11/lcUniConv/iso8859_14.h
View file @ b4571a8f
/* $XFree86$ */
/*
* ISO-8859-14
......
nx-X11/lib/X11/lcUniConv/iso8859_15.h
View file @ b4571a8f
/* $XFree86$ */
/*
* ISO-8859-15
......
nx-X11/lib/X11/lcUniConv/jisx0201.h
View file @ b4571a8f
/* $XFree86$ */
/*
* JISX0201.1976-0
......
nx-X11/lib/X11/lcUniConv/ksc5601.h
View file @ b4571a8f
......@@ -2967,17 +2967,17 @@ ksc5601_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
const Summary16 *summary = NULL;
if (wc < 0x0460)
summary = &ksc5601_uni2indx_page00[(wc>>4)];
else if (wc >= 0x2000 && wc < 0x2670)
else if (wc >= 0x2000 && wc < 0x2670) /* General Punctuation (2000, 206F) */
summary = &ksc5601_uni2indx_page20[(wc>>4)-0x200];
else if (wc >= 0x3000 && wc < 0x33e0)
else if (wc >= 0x3000 && wc < 0x33e0) /* CJK Symbols and Punctuation (3000, 303F) */
summary = &ksc5601_uni2indx_page30[(wc>>4)-0x300];
else if (wc >= 0x4e00 && wc < 0x9fa0)
else if (wc >= 0x4e00 && wc < 0x9fa0) /* CJK Unified Ideographs (4E00, 9FFF) */
summary = &ksc5601_uni2indx_page4e[(wc>>4)-0x4e0];
else if (wc >= 0xac00 && wc < 0xd7a0)
else if (wc >= 0xac00 && wc < 0xd7a0) /* Hangul Syllables (AC00, D7AF) 11183 */
summary = &ksc5601_uni2indx_pageac[(wc>>4)-0xac0];
else if (wc >= 0xf900 && wc < 0xfa10)
else if (wc >= 0xf900 && wc < 0xfa10) /* CJK Compatibility Ideographs (F900, FAFF) */
summary = &ksc5601_uni2indx_pagef9[(wc>>4)-0xf90];
else if (wc >= 0xff00 && wc < 0xfff0)
else if (wc >= 0xff00 && wc < 0xfff0) /* Halfwidth and Fullwidth Forms (FF00, FFEF) */
summary = &ksc5601_uni2indx_pageff[(wc>>4)-0xff0];
if (summary) {
unsigned short used = summary->used;
......
nx-X11/lib/X11/lcUniConv/mulelao.h
View file @ b4571a8f
/* $XFree86$ */
/*
* MULELAO-1
......
nx-X11/lib/X11/lcUniConv/tcvn.h
View file @ b4571a8f
/* $XFree86$ */
/*
* TCVN-5712
......
nx-X11/lib/X11/lcUniConv/ucs2be.h
View file @ b4571a8f
/*
* UCS-2BE = UCS-2 big endian
*/
/* $XFree86$ */
static int
ucs2be_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
......
nx-X11/lib/X11/lcUniConv/viscii.h
View file @ b4571a8f
/* $XFree86$ */
/*
* VISCII1.1-1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment