pxbase (19jun17)

git-svn-id: svn://tug.org/texlive/trunk@44640 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 15 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/platex/pxbase/README-ja.md b/Master/texmf-dist/doc/platex/pxbase/README-ja.md
index 58b2e47666e..bbe319c0710 100644
--- a/Master/texmf-dist/doc/platex/pxbase/README-ja.md
+++ b/Master/texmf-dist/doc/platex/pxbase/README-ja.md
@@ -165,6 +165,9 @@ upLaTeX の場合：
 更新履歴
 --------
 
+  * Version 1.1a 〈2017/06/19〉
+      - バグ修正。
+
   * Version 1.1  〈2017/05/29〉
       - 内容の整理。  
         ※バージョンの値は BXbase と合致させて 1.1 版とした。
diff --git a/Master/texmf-dist/doc/platex/pxbase/README.md b/Master/texmf-dist/doc/platex/pxbase/README.md
index 60016a18bea..e531ff8670f 100644
--- a/Master/texmf-dist/doc/platex/pxbase/README.md
+++ b/Master/texmf-dist/doc/platex/pxbase/README.md
@@ -67,6 +67,7 @@ README-ja.md).
 Revision History
 ----------------
 
+  * Version 1.1a 〈2017/06/19〉
   * Version 1.1  〈2017/05/29〉
   * Version 0.5i 〈2017/05/04〉 ― for CTAN
   * Version 0.9b 〈2012/08/19〉
diff --git a/Master/texmf-dist/doc/platex/pxbase/pxbabel.pdf b/Master/texmf-dist/doc/platex/pxbase/pxbabel.pdf
index fc348b92bd8..31ca6c1b778 100644
--- a/Master/texmf-dist/doc/platex/pxbase/pxbabel.pdf
+++ b/Master/texmf-dist/doc/platex/pxbase/pxbabel.pdf
diff --git a/Master/texmf-dist/doc/platex/pxbase/pxbabel.tex b/Master/texmf-dist/doc/platex/pxbase/pxbabel.tex
index 733babd1ff6..d8ad548b279 100644
--- a/Master/texmf-dist/doc/platex/pxbase/pxbabel.tex
+++ b/Master/texmf-dist/doc/platex/pxbase/pxbabel.tex
@@ -3,8 +3,8 @@
 \documentclass[a4paper,uplatex]{jsarticle}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.1}
-\newcommand{\PkgDate}{2017/05/29}
+\newcommand{\PkgVersion}{1.1a}
+\newcommand{\PkgDate}{2017/06/19}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
 \newcommand{\Note}{\par\noindent ※}
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty b/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty
index 97b5e4ad568..7c1f1fd3e34 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty
+++ b/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxbabel}[2017/05/29 v1.1 PX Babel interface for CJK]
+\ProvidesPackage{pxbabel}[2017/06/19 v1.1a PX Babel interface for CJK]
 \def\pxbb@pkgname{pxbabel}
 
 %--------------------------------------- general
@@ -82,6 +82,8 @@
 \newbool{pxbb@prefermmivjis}
 \DeclareOption{prefer2004jis}{\pxbb@prefermmivjistrue}
 \DeclareOption{noprefer2004jis}{\pxbb@prefermmivjisfalse}
+\DeclareOption{jis2004}{\pxbb@prefermmivjistrue}
+\DeclareOption{nojis2004}{\pxbb@prefermmivjisfalse}
 % (<lang_id>, +<lang_id>)
 \bxForEachIn\pxbb@cjk@langid@list\do{%
   \DeclareOption{#1}{%
@@ -344,9 +346,11 @@
     \pxbb@set@full@ja@enc
     \let\pxInNonJaLanguage=#3%
     \let\pxbb@org@encoding\cy@encoding
+    \long\def\kanjiencodingdefault{#2}%
     \kanjiencoding{#2}\selectfont}%
   \csappto{noextras#1}{%
     \let\pxInNonJaLanguage\@undefined
+    \long\def\kanjiencodingdefault{\pxbb@org@encoding}%
     \kanjiencoding{\pxbb@org@encoding}\selectfont}}
 \pxbb@addtoextras{japanese}{t}{}
 \pxbb@addtoextras{korean}{f}{J21}
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxbase.sty b/Master/texmf-dist/tex/platex/pxbase/pxbase.sty
index d8632d6140f..2393933389f 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxbase.sty
+++ b/Master/texmf-dist/tex/platex/pxbase/pxbase.sty
@@ -8,7 +8,7 @@
 %% This package is distributed under the MIT License.
 %%
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxbase}[2017/05/29 v1.1 PX base library]
+\ProvidesPackage{pxbase}[2017/06/19 v1.1a PX base library]
 % The pxbase package now does the same thing as the bxbase package.
 \RequirePackageWithOptions{bxbase}[2017/05/29]
 \endinput
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def b/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def
index adb0b56277a..64709af2b9c 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def
+++ b/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def
@@ -4,7 +4,7 @@
 
 %% file declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxbasenc.def}[2017/05/29 v1.1 PX encoding library]
+\ProvidesFile{pxbasenc.def}[2017/06/19 v1.1a PX encoding library]
 \def\pxec@pkgname{PXbase} % bundle name
 
 %% code guards
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def b/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def
index 53a55dae44b..7a612f2c360 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def
+++ b/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def
@@ -4,7 +4,7 @@
 
 %% file declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjsfenc.def}[2017/05/29 v1.1 PX JSF encoding]
+\ProvidesFile{pxjsfenc.def}[2017/06/19 v1.1a PX JSF encoding]
 
 %% code guards
 \edef\pxec@jsf@restore@codes{%
diff --git a/Master/texmf-dist/tex/platex/pxbase/upkcat.sty b/Master/texmf-dist/tex/platex/pxbase/upkcat.sty
index 0f7529b1357..a97cbde36d3 100644
--- a/Master/texmf-dist/tex/platex/pxbase/upkcat.sty
+++ b/Master/texmf-dist/tex/platex/pxbase/upkcat.sty
@@ -35,7 +35,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{upkcat}[2017/05/29 v1.1 safe kcatcode access]
+\ProvidesPackage{upkcat}[2017/06/19 v1.1a safe kcatcode access]
 
 %--------------------------------------- main