mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-29 22:35:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

ECI: Update ECIs to AIM ITS/04-023:2022, adding UTF-16BE (was USC-2BE),

Browse source 
UTF-16LE, GBK, separate GB18030, UTF-32BE, UTF-32LE
  add examples to tests for DATAMATRIX, HANXIN, QRCODE
HANXIN: Remove alternating filler in function information;
  GB 18030 now ECI 32 (previously used ECI 29);
  fix gate-posts on codeword limits
  use new ZXing-C++ HanXin detector (diagnostics2 branch) for tests
  check against ISO/IEC 20830:2021 (no substantive changes)
backend_tcl: update ECIs; NOTE: changed names "unicode" -> "utf-16be",
  "euc-cn" -> "gb2312"
GRIDMATRIX/HANXIN/QRCODE/RMQR: warn if auto-conversion (i.e. no ECI given)
  occurs to resp. specialized char sets (GB 2312/GB 18030/Shift JIS)
This commit is contained in:
gitlost 2022-04-10 11:12:18 +01:00
parent 69876619dd
commit 624d40021e
38 changed files with 5761 additions and 835 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/gb18030.c
View file

@ -1,6 +1,6 @@
/*
libzint - the open source barcode library
Copyright (C) 2019-2021 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2019-2022 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@ -27,7 +27,6 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
*/
/* vim: set ts=4 sw=4 et : */
/*
* Adapted from GNU LIBICONV library and patched to allow 2 duplicate mappings
* for compatibility with GB 2312 (GB2312.TXT):
@ -2422,7 +2421,7 @@ static int gbkext_inv_wctomb(unsigned int *r, const unsigned int wc) {
* GBK (libiconv-1.16/lib/gbk.h)
*/
static int gbk_wctomb(unsigned int *r, const unsigned int wc) {
INTERNAL int gbk_wctomb_zint(unsigned int *r, const unsigned int wc) {
int ret;
/* ZINT: Note these mappings U+30FB and U+2015 different from GB 2312 */
@ -2551,7 +2550,7 @@ static const unsigned short gb18030ext_pagefe[16] = {
0xa6ed, 0xa6f3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x18-0x1f*/
};
static int gb18030ext_wctomb(unsigned int *r, const unsigned int wc) {
STATIC_UNLESS_ZINT_TEST int gb18030ext_wctomb(unsigned int *r, const unsigned int wc) {
unsigned short c = 0;
if (wc == 0x01f9) {
c = 0xa8bf;
@ -2725,7 +2724,7 @@ static const unsigned short gb18030uni_ranges[206] = {
25994, 25998, 26012, 26016, 26110, 26116
};
static int gb18030uni_wctomb(unsigned int *r1, unsigned int *r2, const unsigned int wc) {
STATIC_UNLESS_ZINT_TEST int gb18030uni_wctomb(unsigned int *r1, unsigned int *r2, const unsigned int wc) {
unsigned int i = wc;
if (i >= 0x0080 && i <= 0xffff) {
if (i == 0xe7c7) {
@ -2806,7 +2805,7 @@ INTERNAL int gb18030_wctomb_zint(unsigned int *r1, unsigned int *r2, const unsig
}
/* Code set 1 (GBK extended) */
ret = gbk_wctomb(r1, wc);
ret = gbk_wctomb_zint(r1, wc);
if (ret) {
return ret;
}
@ -2973,3 +2972,5 @@ INTERNAL void gb18030_cpy(const unsigned char source[], int *p_length, unsigned
}
}
}
/* vim: set ts=4 sw=4 et : */