From 48b026e7500c5f7239e173d14d09b9e2e272e874 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 5 Sep 2018 15:27:22 +0200 Subject: Regularize language and script names. Drop the unused 'serif' argument to the CJK lookup functions. Use the BCP 47 names for CJK scripts and languages: zh-Hant for traditional Chinese, zh-Hans for simplified Chinese, ja for Japanese, ko for Korean. The lookup function also allows commonly used language+country codes: zh-TW and zh-HK for traditional Chinese, zh-CN for simplified Chinese. --- platform/java/mupdf_native.c | 16 ++++++++-------- platform/java/mupdf_native.h | 16 ++++++++-------- platform/java/src/com/artifex/mupdf/fitz/Font.java | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'platform') diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 6d86e425..459590ba 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -258,10 +258,10 @@ static int check_enums() valid &= com_artifex_mupdf_fitz_Font_GREEK == PDF_SIMPLE_ENCODING_GREEK; valid &= com_artifex_mupdf_fitz_Font_CYRILLIC == PDF_SIMPLE_ENCODING_CYRILLIC; - valid &= com_artifex_mupdf_fitz_Font_CN == FZ_ADOBE_CNS_1; - valid &= com_artifex_mupdf_fitz_Font_TW == FZ_ADOBE_GB_1; - valid &= com_artifex_mupdf_fitz_Font_JP == FZ_ADOBE_JAPAN_1; - valid &= com_artifex_mupdf_fitz_Font_KR == FZ_ADOBE_KOREA_1; + valid &= com_artifex_mupdf_fitz_Font_ADOBE_CNS == FZ_ADOBE_CNS; + valid &= com_artifex_mupdf_fitz_Font_ADOBE_GB == FZ_ADOBE_GB; + valid &= com_artifex_mupdf_fitz_Font_ADOBE_JAPAN == FZ_ADOBE_JAPAN; + valid &= com_artifex_mupdf_fitz_Font_ADOBE_KOREA == FZ_ADOBE_KOREA; valid &= com_artifex_mupdf_fitz_PDFAnnotation_LINE_ENDING_NONE == PDF_ANNOT_LE_NONE; valid &= com_artifex_mupdf_fitz_PDFAnnotation_LINE_ENDING_SQUARE == PDF_ANNOT_LE_SQUARE; @@ -1020,10 +1020,10 @@ fz_font *load_droid_fallback_font(fz_context *ctx, int script, int language, int fz_font *load_droid_cjk_font(fz_context *ctx, const char *name, int ros, int serif) { switch (ros) { - case FZ_ADOBE_CNS_1: return load_noto_cjk(ctx, TC); - case FZ_ADOBE_GB_1: return load_noto_cjk(ctx, SC); - case FZ_ADOBE_JAPAN_1: return load_noto_cjk(ctx, JP); - case FZ_ADOBE_KOREA_1: return load_noto_cjk(ctx, KR); + case FZ_ADOBE_CNS: return load_noto_cjk(ctx, TC); + case FZ_ADOBE_GB: return load_noto_cjk(ctx, SC); + case FZ_ADOBE_JAPAN: return load_noto_cjk(ctx, JP); + case FZ_ADOBE_KOREA: return load_noto_cjk(ctx, KR); } return NULL; } diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h index 0e581fda..fe318382 100644 --- a/platform/java/mupdf_native.h +++ b/platform/java/mupdf_native.h @@ -797,14 +797,14 @@ extern "C" { #define com_artifex_mupdf_fitz_Font_GREEK 1L #undef com_artifex_mupdf_fitz_Font_CYRILLIC #define com_artifex_mupdf_fitz_Font_CYRILLIC 2L -#undef com_artifex_mupdf_fitz_Font_CN -#define com_artifex_mupdf_fitz_Font_CN 0L -#undef com_artifex_mupdf_fitz_Font_TW -#define com_artifex_mupdf_fitz_Font_TW 1L -#undef com_artifex_mupdf_fitz_Font_JP -#define com_artifex_mupdf_fitz_Font_JP 2L -#undef com_artifex_mupdf_fitz_Font_KR -#define com_artifex_mupdf_fitz_Font_KR 3L +#undef com_artifex_mupdf_fitz_Font_ADOBE_CNS +#define com_artifex_mupdf_fitz_Font_ADOBE_CNS 0L +#undef com_artifex_mupdf_fitz_Font_ADOBE_GB +#define com_artifex_mupdf_fitz_Font_ADOBE_GB 1L +#undef com_artifex_mupdf_fitz_Font_ADOBE_JAPAN +#define com_artifex_mupdf_fitz_Font_ADOBE_JAPAN 2L +#undef com_artifex_mupdf_fitz_Font_ADOBE_KOREA +#define com_artifex_mupdf_fitz_Font_ADOBE_KOREA 3L /* * Class: com_artifex_mupdf_fitz_Font * Method: finalize diff --git a/platform/java/src/com/artifex/mupdf/fitz/Font.java b/platform/java/src/com/artifex/mupdf/fitz/Font.java index f6ac2ce7..f56a0a48 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/Font.java +++ b/platform/java/src/com/artifex/mupdf/fitz/Font.java @@ -10,10 +10,10 @@ public class Font public static final int GREEK = 1; public static final int CYRILLIC = 2; - public static final int CN = 0; - public static final int TW = 1; - public static final int JP = 2; - public static final int KR = 3; + public static final int ADOBE_CNS = 0; + public static final int ADOBE_GB = 1; + public static final int ADOBE_JAPAN = 2; + public static final int ADOBE_KOREA = 3; private long pointer; -- cgit v1.2.3