Add GB18030 charset support for localization (Issue #159)

OpenPrinting · Mar 25, 2021 · bab9ee1 · bab9ee1
1 parent 2e93fd7
commit bab9ee1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 */