From 48b026e7500c5f7239e173d14d09b9e2e272e874 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
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.
---
 docs/manual-mutool-create.html | 19 ++++++++++---------
 docs/manual-mutool-run.html    |  5 +++--
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'docs')

diff --git a/docs/manual-mutool-create.html b/docs/manual-mutool-create.html
index 41a640eb..2bdd7b0e 100644
--- a/docs/manual-mutool-create.html
+++ b/docs/manual-mutool-create.html
@@ -83,15 +83,16 @@ font will be encoded using ISO 8859-7 or KOI8-U, respectively.
 </pre>
 
 <p>
-CJK fonts can also be created by passing a code for one of the 4 CID orderings:
-CN, TW, JP, or KR (Simplified Chinese, Traditional Chinese, Japanese, and Korean).
+CJK fonts can be created by passing a language tag for one of the 4 CID orderings:
+zh-Hant, zh-Hans, ja, or ko (Traditional Chinese, Simplified Chinese, Japanese, Korean).
+The CJK font will use the UTF-16 encoding.
 A font file will not be embedded, so a PDF viewer will use a substitute font.
 
 <pre>
-%%CJKFont Batang KR
-%%CJKFont Mincho JP
-%%CJKFont Ming TW
-%%CJKFont Song CN
+%%CJKFont Batang ko
+%%CJKFont Mincho ja
+%%CJKFont Ming zh-Hant
+%%CJKFont Song zh-Hans
 </pre>
 
 <p>
@@ -102,9 +103,9 @@ An example input file:
 %%Font TmRm Times-Roman
 %%Font Helv-C Helvetica Cyrillic
 %%Font Helv-G Helvetica Greek
-%%CJKFont Song CN
-%%CJKFont Mincho JP
-%%CJKFont Batang KR
+%%CJKFont Song zh-Hant
+%%CJKFont Mincho ja
+%%CJKFont Batang ko
 %%Image I0 logo/mupdf-simplified-logo.png
 
 % Draw an image.
diff --git a/docs/manual-mutool-run.html b/docs/manual-mutool-run.html
index 1cae82df..c1fe6237 100644
--- a/docs/manual-mutool-run.html
+++ b/docs/manual-mutool-run.html
@@ -495,7 +495,8 @@ In PDF there are also special Type3 fonts.
 <dl>
 <dt>new Font(fontName or fileName)
 <dd>Create a new font, either using a built-in font name or a filename.
-The built-in fonts are: Times-Roman, Times-Italic, Times-Bold, Times-BoldItalic,
+<br>The built-in standard PDF fonts are:
+Times-Roman, Times-Italic, Times-Bold, Times-BoldItalic,
 Helvetica, Helvetica-Oblique, Helvetica-Bold, Helvetica-BoldOblique,
 Courier, Courier-Oblique, Courier-Bold, Courier-BoldOblique,
 Symbol, and ZapfDingbats.
@@ -759,7 +760,7 @@ Encoding is either "Latin" (CP-1252), "Greek" (ISO-8859-7), or "Cyrillic" (KOI-8
 The default is "Latin".
 <dt>PDFDocument#addCJKFont(font, language, wmode, style)
 <dd>Create a PDF object from the Font object as a UTF-16 encoded CID font for the given
-language ("TC", "SC", "KR", or "JP"),
+language ("zh-Hant", "zh-Hans", "ko", or "ja"),
 writing mode ("H" or "V"),
 and style ("serif" or "sans-serif").
 <dt>PDFDocument#addFont(font)
-- 
cgit v1.2.3