xcjk2uni (18may14)

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

2 files changed, 16 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx
index 37525db94dd..b9cbc4eaff0 100644
--- a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx
+++ b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx
@@ -99,7 +99,7 @@ and some specific Chinese Simplified fonts.
 \askforoverwritefalse
 \preamble
 
-   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
@@ -150,14 +150,14 @@ and some specific Chinese Simplified fonts.
 %<*driver|package|make>
 \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.}
 %<*driver>
 \ProvidesExplFile{\ExplFileName.\ExplFileExtension}
 %</driver>
 %<package>\ProvidesExplPackage{\ExplFileName}
 %<make>\ProvidesExplFile{xCJK2uni-make.ltx}
-  {\ExplFileDate}{0.2}{\ExplFileDescription}
+  {\ExplFileDate}{0.3}{\ExplFileDescription}
 %<*driver>
 \ExplSyntaxOff
 %</driver>
@@ -166,6 +166,7 @@ and some specific Chinese Simplified fonts.
 %<*driver>
 \documentclass[full,a4paper]{l3doc}
 \usepackage{xeCJK}
+\usepackage{indentfirst}
 \usepackage{geometry}
 \hypersetup{pdfstartview=FitH}
 \geometry{includemp,hmargin={0mm,15mm},vmargin=15mm,footskip=7mm}
@@ -206,7 +207,7 @@ and some specific Chinese Simplified fonts.
 %</driver>
 % \fi
 %
-% \CheckSum{653}
+% \CheckSum{655}
 % \GetFileInfo{\jobname.dtx}
 %
 % \title{\bfseries\pkg{xCJK2uni} 宏包}
@@ -563,6 +564,11 @@ and some specific Chinese Simplified fonts.
 %    \end{macrocode}
 %
 %    \begin{macrocode}
+\luatex_if_engine:T
+  { \RequirePackage { pdftexcmds } }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \msg_new:nnn { xCJK2uni } { file-not-found }
   {
     SFD file~`#2'~for~encoding~`#1'~not~found.\\
@@ -770,7 +776,7 @@ and some specific Chinese Simplified fonts.
         1~begincodespacerange \iow_newline:
         \c_@@_indent_str < 00 > ~
         <
-          \int_to_hexadecimal:n
+          \int_to_Hex:n
             { \seq_count:N \l_@@_sfd_plane_seq - \c_one }
         > \iow_newline:
         endcodespacerange
@@ -805,7 +811,7 @@ and some specific Chinese Simplified fonts.
             \iow_newline:
             100 ~ beginbfchar \iow_newline:
             \l_@@_cmap_block_tl
-            < \int_to_hexadecimal:n { \l_@@_sfd_index_int } > ~
+            < \int_to_Hex:n { \l_@@_sfd_index_int } > ~
             <#1> \iow_newline:
             endbfchar
           }
@@ -816,7 +822,7 @@ and some specific Chinese Simplified fonts.
           {
             <
               \int_compare:nNnF \l_@@_sfd_index_int > \c_fifteen { 0 }
-              \int_to_hexadecimal:n { \l_@@_sfd_index_int }
+              \int_to_Hex:n { \l_@@_sfd_index_int }
             > ~ <#1> \iow_newline:
           }
       }
@@ -857,7 +863,7 @@ and some specific Chinese Simplified fonts.
 \group_begin:
 \char_set_catcode_space:n { 32 }
 \tl_const:Nx \c_@@_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 \@@_identification:n #1
   {
diff --git a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins
index 91a73653c75..66450ecd8e2 100644
--- a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins
+++ b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins
@@ -6,7 +6,7 @@
 %%
 %% xCJK2uni.dtx  (with options: `install')
 %% 
-%%    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
@@ -25,7 +25,7 @@
 \askforoverwritefalse
 \preamble
 
-   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