From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 23 Mar 2021 19:00:07 +0000 (-0400)
Subject: Add GB18030 charset support for localization (Issue #159)
X-Git-Tag: v2.4b1~163^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab9ee1bc55b20f85af5bc849fd29435f36a3754;p=thirdparty%2Fcups.git

Add GB18030 charset support for localization (Issue #159)
---

diff --git a/CHANGES.md b/CHANGES.md
index 4765b64810..aaa9a848f5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@ CUPS v2.4rc1 (Pending)
 - Fixed a PPD memory leak caused by emulator definitions (Issue #124)
 - The scheduler now includes the `[Job N]` prefix for job log messages, even
   when using syslog logging (Issue #154)
+- Added support for locales using the GB18030 character set (Issue #159)
 - Documentation fixes (Issue #92)
 - Localization updates (Issue #123, Issue #129, Issue #134, Issue #146)
 - USB quirk updates (Apple #5766, Apple #5838, Apple #5843, Apple #5867)
diff --git a/cups/language.c b/cups/language.c
index e064169903..7e7aed1967 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -70,7 +70,7 @@ static const char * const lang_encodings[] =
 			  "unknown",		"unknown",
 			  "cp932",		"cp936",
 			  "cp949",		"cp950",
-			  "cp1361",		"unknown",
+			  "cp1361",		"bg18030",
 			  "unknown",		"unknown",
 			  "unknown",		"unknown",
 			  "unknown",		"unknown",
@@ -478,7 +478,7 @@ cupsLangGet(const char *language)	/* I - Language or locale */
 		  "",		"",		"",		"",
 
 		  "CP932",	"CP936",	"CP949",	"CP950",
-		  "CP1361",	"",		"",		"",
+		  "CP1361",	"GB18030",	"",		"",
 		  "",		"",		"",		"",
 		  "",		"",		"",		"",
 		  "",		"",		"",		"",
diff --git a/cups/language.h b/cups/language.h
index b5ec7e1803..4dcca01d0f 100644
--- a/cups/language.h
+++ b/cups/language.h
@@ -66,6 +66,7 @@ typedef enum cups_encoding_e		/**** Language Encodings @exclude all@ ****/
   CUPS_WINDOWS_949,			/* Korean KS C5601-1992 */
   CUPS_WINDOWS_950,			/* Traditional Chinese Big Five */
   CUPS_WINDOWS_1361,			/* Korean Johab */
+  CUPS_BG18030,				/* Chinese GB 18030 @since CUPS 2.4.0@ */
   CUPS_ENCODING_DBCS_END = 127,		/* End of double-byte encodings @private@ */
 
   CUPS_EUC_CN,				/* EUC Simplified Chinese */