xcjk2uni (18may14)

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

8 files changed, 18 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def
index ea9d3c3fe2b..fafda5f90e6 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def
@@ -2,7 +2,7 @@
 %% This is file `xCJK2uni-UBg5plus.def',
 %% generated from file `UBg5plus.sfd' by `xCJK2uni-make.ltx'.
 %%
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-UBg5plus.def}
   {\ExplFileDate}{0.2}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def
index c8d5724cde1..ca130de504f 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def
@@ -2,7 +2,7 @@
 %% This is file `xCJK2uni-UBig5.def',
 %% generated from file `UBig5.sfd' by `xCJK2uni-make.ltx'.
 %%
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-UBig5.def}
   {\ExplFileDate}{0.2}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def
index 24713291e40..44f75e036e0 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def
@@ -2,7 +2,7 @@
 %% This is file `xCJK2uni-UGB.def',
 %% generated from file `UGB.sfd' by `xCJK2uni-make.ltx'.
 %%
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-UGB.def}
   {\ExplFileDate}{0.2}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def
index c70d7aa6c35..dad956e9e6e 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def
@@ -2,7 +2,7 @@
 %% This is file `xCJK2uni-UGBK.def',
 %% generated from file `UGBK.sfd' by `xCJK2uni-make.ltx'.
 %%
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-UGBK.def}
   {\ExplFileDate}{0.2}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def
index 2c389d22d85..42dfe02f098 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def
@@ -2,7 +2,7 @@
 %% This is file `xCJK2uni-UJIS.def',
 %% generated from file `UJIS.sfd' by `xCJK2uni-make.ltx'.
 %%
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-UJIS.def}
   {\ExplFileDate}{0.2}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def
index d2bb139ade1..4cc96641508 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def
@@ -2,7 +2,7 @@
 %% This is file `xCJK2uni-UKS.def',
 %% generated from file `UKS.sfd' by `xCJK2uni-make.ltx'.
 %%
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-UKS.def}
   {\ExplFileDate}{0.2}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-make.ltx b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-make.ltx
index ea5e247e456..8d2dbbc320d 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-make.ltx
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-make.ltx
@@ -6,7 +6,7 @@
 %%
 %% xCJK2uni.dtx  (with options: `make')
 %% 
-%%    Copyright (C) 2013 by Qing Lee <sobenlee@gmail.com>
+%%    Copyright (C) 2013-2014 by Qing Lee <sobenlee@gmail.com>
 %% --------------------------------------------------------------------------
 %%    This work may be distributed and/or modified under the
 %%    conditions of the LaTeX Project Public License, either version 1.3
@@ -21,10 +21,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-make.ltx}
-  {\ExplFileDate}{0.2}{\ExplFileDescription}
+  {\ExplFileDate}{0.3}{\ExplFileDescription}
+\luatex_if_engine:T
+  { \RequirePackage { pdftexcmds } }
 \msg_new:nnn { xCJK2uni } { file-not-found }
   {
     SFD file~`#2'~for~encoding~`#1'~not~found.\\
@@ -191,7 +193,7 @@
         1~begincodespacerange \iow_newline:
         \c__CJKtu_indent_str < 00 > ~
         <
-          \int_to_hexadecimal:n
+          \int_to_Hex:n
             { \seq_count:N \l__CJKtu_sfd_plane_seq - \c_one }
         > \iow_newline:
         endcodespacerange
@@ -221,7 +223,7 @@
             \iow_newline:
             100 ~ beginbfchar \iow_newline:
             \l__CJKtu_cmap_block_tl
-            < \int_to_hexadecimal:n { \l__CJKtu_sfd_index_int } > ~
+            < \int_to_Hex:n { \l__CJKtu_sfd_index_int } > ~
             <#1> \iow_newline:
             endbfchar
           }
@@ -232,7 +234,7 @@
           {
             <
               \int_compare:nNnF \l__CJKtu_sfd_index_int > \c_fifteen { 0 }
-              \int_to_hexadecimal:n { \l__CJKtu_sfd_index_int }
+              \int_to_Hex:n { \l__CJKtu_sfd_index_int }
             > ~ <#1> \iow_newline:
           }
       }
@@ -263,7 +265,7 @@
 \group_begin:
 \char_set_catcode_space:n { 32 }
 \tl_const:Nx \c__CJKtu_svn_id_str
-  {\tl_to_str:n {$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $}}
+  {\tl_to_str:n {$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $}}
 \group_end:
 \cs_new_nopar:Npx \__CJKtu_identification:n #1
   {
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty
index e80bf60234a..82fffb22565 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty
@@ -6,7 +6,7 @@
 %%
 %% xCJK2uni.dtx  (with options: `package')
 %% 
-%%    Copyright (C) 2013 by Qing Lee <sobenlee@gmail.com>
+%%    Copyright (C) 2013-2014 by Qing Lee <sobenlee@gmail.com>
 %% --------------------------------------------------------------------------
 %%    This work may be distributed and/or modified under the
 %%    conditions of the LaTeX Project Public License, either version 1.3
@@ -21,10 +21,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xCJK2uni.dtx 643 2014-04-29 09:36:22Z sobenlee $
+\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $
   {Convert CJK character to Unicode.}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{0.2}{\ExplFileDescription}
+  {\ExplFileDate}{0.3}{\ExplFileDescription}
 \pdftex_if_engine:F
   {
     \msg_new:nnn  { xCJK2uni } { pdflatex }