summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdfbin147622 -> 148022 bytes
-rw-r--r--Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx22
-rw-r--r--Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins4
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBg5plus.def2
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def2
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGB.def2
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UGBK.def2
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UJIS.def2
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UKS.def2
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-make.ltx16
-rw-r--r--Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty6
11 files changed, 34 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf b/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf
index 9c1d61e2d51..d67d4ea2584 100644
--- a/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf
+++ b/Master/texmf-dist/doc/latex/xcjk2uni/xCJK2uni.pdf
Binary files differ
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
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 }
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 20:45:54 +0000