summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/xcjk2uni
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-30 21:05:58 +0000
committerKarl Berry <karl@freefriends.org>2018-01-30 21:05:58 +0000
commit4011de170d5d27b6758bef7c7146ab7297b80301 (patch)
tree72f6d3219348fb44ef984042d554dd5b3daf1dac /Master/texmf-dist/source/latex/xcjk2uni
parent83e0b95d2f78cf405abe952e383dcd0d986eee66 (diff)
xcjk2uni (30jan18)
git-svn-id: svn://tug.org/texlive/trunk@46496 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/xcjk2uni')
-rw-r--r--Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx104
-rw-r--r--Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins4
2 files changed, 56 insertions, 52 deletions
diff --git a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx
index e2a3420984f..a0ebd966da7 100644
--- a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx
+++ b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.dtx
@@ -1,4 +1,4 @@
-% \iffalse meta-comment
+% \iffalse meta-comment
% !TEX program = XeLaTeX
%<*internal>
\iffalse
@@ -44,7 +44,7 @@ Issues and pull requests are welcome.
Copyright and Licence
---------------------
- Copyright (C) 2013-2014, 2016 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -89,7 +89,7 @@ Copyright and Licence
\preamble
- Copyright (C) 2013-2014, 2016 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com>
--------------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -192,7 +192,7 @@ Copyright and Licence
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\RequirePackage{expl3}
%<make>\input expl3-generic %
-%<+package|make|def>\GetIdInfo$Id$
+%<+package|make|def>\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $
%<package|make|def> {Convert CJK character to Unicode.}
%<*driver>
\def\ctxaux#1#2#3{\def\ctxversion{v#2}}\ctxaux
@@ -214,7 +214,7 @@ Copyright and Licence
%<JIS>\ProvidesExplFile{xCJK2uni-UJIS.def}
%<KS>\ProvidesExplFile{xCJK2uni-UKS.def}
%<*driver|package|make|def>
- {\ExplFileDate}{0.6}{\ExplFileDescription}
+ {\ExplFileDate}{0.7}{\ExplFileDescription}
%</driver|package|make|def>
%<*driver>
\documentclass{ctxdoc}
@@ -226,7 +226,7 @@ Copyright and Licence
%</driver>
% \fi
%
-% \CheckSum{612}
+% \CheckSum{600}
% \GetFileId{xCJK2uni.sty}
%
% \title{\bfseries\pkg{xCJK2uni} 宏包}
@@ -300,7 +300,7 @@ Copyright and Licence
'l3kernel'~and~'l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2015/09/24 } { }
+\@ifpackagelater { expl3 } { 2017/12/16 } { }
{ \msg_error:nn { xCJK2uni } { l3-too-old } }
% \end{macrocode}
%
@@ -328,11 +328,11 @@ Copyright and Licence
\int_set:Nn \l_@@_ii_max_int { "FE }
% \end{macrocode}
%
-% \begin{macro}[internal]{\@@_set_enc:nnnnnn}
+% \begin{macro}{\@@_set_enc:nnnnnn}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_set_enc:nnnnnn #1#2#3#4#5#6
{
- \seq_put_right:Nn \c_@@_encoding_seq {#1}
+ \seq_gput_right:Nn \c_@@_encoding_seq {#1}
\prop_gput:Nnn \c_@@_sfd_prop {#1} {#2}
\int_const:cn { c_@@_ #1 _i_min_int } {#3}
\int_const:cn { c_@@_ #1 _ii_min_int } {#4}
@@ -364,7 +364,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_enc_map:nn}
+% \begin{macro}{\@@_enc_map:nn}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_enc_map:nn #1#2
{
@@ -380,7 +380,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_use_enc_map:n}
+% \begin{macro}{\@@_use_enc_map:n}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_use_enc_map:n #1
{
@@ -394,7 +394,7 @@ Copyright and Licence
Only~\seq_use:Nnnn \c_@@_encoding_seq { ~and~ } { ,~ } { ,~and~ } ~
are~supported.
}
-\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
+\prg_generate_conditional_variant:Nnn \prop_get:NnN { Nx } { TF }
% \end{macrocode}
% \end{macro}
%
@@ -407,7 +407,7 @@ Copyright and Licence
\@@_set_enc:nnnnnn { GBK } { UGBK } { "81 } { "40 } { "7E } { "80 }
% \end{macrocode}
%
-% \begin{macro}[internal]{\@@_sfd_to_unicode:nn}
+% \begin{macro}{\@@_sfd_to_unicode:nn}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_sfd_to_unicode:nn #1#2
{
@@ -417,7 +417,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_get_unicode:w}
+% \begin{macro}{\@@_get_unicode:w}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_get_unicode:w #1 \exp_end:
{
@@ -430,7 +430,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_char_to_unicode:n}
+% \begin{macro}{\@@_char_to_unicode:n}
% \begin{macrocode}
\group_begin:
\char_set_catcode_active:n { "7F }
@@ -452,7 +452,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\CJKtu_bookmarks_hook:}
+% \begin{macro}[int]{\CJKtu_bookmarks_hook:}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \CJKtu_bookmarks_hook:
{
@@ -467,7 +467,8 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\CJKtu_byte:NN,\@@_CCT_byte:NNN}
+% \begin{macro}[int]{\CJKtu_byte:NN}
+% \begin{macro}{\@@_CCT_byte:NNN}
% \begin{macrocode}
\cs_new_nopar:Npn \CJKtu_byte:NN #1#2
{ \CJKtu_byte:nn { `#1 } { `#2 } }
@@ -475,14 +476,15 @@ Copyright and Licence
{ \CJKtu_byte:nn { `#1 } { `#3 } }
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
-% \begin{macro}[internal]{\@@_byte:wnn}
+% \begin{macro}{\@@_byte:wnn}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_byte:wnn #1# { \CJKtu_byte:nn }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\CJKtu_byte:nn}
+% \begin{macro}[int]{\CJKtu_byte:nn}
% \begin{macrocode}
\cs_new_nopar:Npn \CJKtu_byte:nn #1#2
{
@@ -509,7 +511,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\CJKtu_byte_map:nn}
+% \begin{macro}[int]{\CJKtu_byte_map:nn}
% \begin{macrocode}
\cs_new_nopar:Npn \CJKtu_byte_map:nn #1#2
{
@@ -527,7 +529,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_index_map:n}
+% \begin{macro}{\@@_index_map:n}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_index_map:n #1
{
@@ -541,14 +543,14 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_get_unicode:n}
+% \begin{macro}{\@@_get_unicode:n}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_get_unicode:n #1
{ \exp_last_unbraced:Nf \@@_get_unicode:w #1 \exp_end: }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_UTF_xvi_be:n}
+% \begin{macro}{\@@_UTF_xvi_be:n}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_UTF_xvi_be:n #1
{ \exp_args:Nf \@@_UTF_xvi_aux:n { \int_eval:n { "#1 } } }
@@ -593,7 +595,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_initial:N}
+% \begin{macro}{\@@_initial:N}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_initial:N #1
{
@@ -639,7 +641,7 @@ Copyright and Licence
{
\lua_now_x:n
{
- kpse.set_program_name("luatex") ~
+ kpse.set_program_name("kpsewhich") ~
local ~ sfd = kpse.find_file("UGBK.sfd", "subfont~definition~files") ~
if ~ sfd ~ then ~
tex.write(sfd) ~
@@ -650,7 +652,7 @@ Copyright and Licence
{
\ior_open:NnTF \g_@@_sfd_ior { |kpsewhich ~ UGBK.sfd }
{
- \ior_get_str:NN \g_@@_sfd_ior \g_@@_path_str
+ \ior_str_get:NN \g_@@_sfd_ior \g_@@_path_str
\ior_close:N \g_@@_sfd_ior
}
{ \msg_fatal:nnnn { xCJK2uni } { file-not-found } { GBK } { UGBK.sfd } }
@@ -661,9 +663,9 @@ Copyright and Licence
\tl_if_blank:oTF { \g_@@_path_str }
{ \msg_fatal:nnnn { xCJK2uni } { file-not-found } { GBK } { UGBK.sfd } }
{
- \seq_set_split:NnV \l_tmpa_seq { / } \g_@@_path_str
- \seq_pop_right:NN \l_tmpa_seq \g_@@_path_str
- \str_gset:Nx \g_@@_path_str { \seq_use:Nn \l_tmpa_seq { / } }
+ \exp_args:No \file_parse_full_name:nNNN { \g_@@_path_str }
+ \l_tmpa_str \l_tmpb_str \l_tmpb_str
+ \str_gset_eq:NN \g_@@_path_str \l_tmpa_str
}
% \end{macrocode}
%
@@ -679,24 +681,26 @@ Copyright and Licence
\int_new:N \l_@@_sfd_index_int
% \end{macrocode}
%
-% \begin{macro}[internal]{\c_@@_sfd_map_prop}
+% \begin{variable}{\c_@@_sfd_map_prop}
% \begin{macrocode}
-\prop_new:N \c_@@_sfd_map_prop
-\prop_gput:Nnn \c_@@_sfd_map_prop { GB } { { 10 } { UGB } }
-\prop_gput:Nnn \c_@@_sfd_map_prop { JIS } { { 40 } { UJIS } }
-\prop_gput:Nnn \c_@@_sfd_map_prop { KS } { { 60 } { UKS } }
-\prop_gput:Nnn \c_@@_sfd_map_prop { Bg5 } { { 00 } { UBig5 } }
-\prop_gput:Nnn \c_@@_sfd_map_prop { Bg5+ } { { 09 } { UBg5plus } }
-\prop_gput:Nnn \c_@@_sfd_map_prop { GBK } { { 19 } { UGBK } }
+\prop_const_from_keyval:Nn \c_@@_sfd_map_prop
+ {
+ GB = { 10 } { UGB } ,
+ JIS = { 40 } { UJIS } ,
+ KS = { 60 } { UKS } ,
+ Bg5 = { 00 } { UBig5 } ,
+ Bg5+ = { 09 } { UBg5plus } ,
+ GBK = { 19 } { UGBK }
+ }
% \end{macrocode}
-% \end{macro}
+% \end{variable}
%
-% \begin{macro}[internal]{\@@_write_file:nnn}
+% \begin{macro}{\@@_write_file:nnn}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_write_file:nnn #1#2#3
{
\group_begin:
- \file_path_include:n { \g_@@_path_str / }
+ \seq_put_right:No \l_file_search_path_seq { \g_@@_path_str }
\ior_open:NnTF \g_@@_sfd_ior { #3.sfd }
{
\group_end:
@@ -729,7 +733,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_read_sfd_line:n,\@@_read_sfd_line:nn}
+% \begin{macro}{\@@_read_sfd_line:n,\@@_read_sfd_line:nn}
% \begin{macrocode}
\cs_new_protected_nopar:Npx \@@_read_sfd_line:nnn #1#2#3
{
@@ -749,7 +753,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_read_sfd_line:nnnnn}
+% \begin{macro}{\@@_read_sfd_line:nnnnn}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_read_sfd_line:nnnnn #1#2#3#4#5
{
@@ -774,14 +778,14 @@ Copyright and Licence
\iow_now:Nx \g_@@_sfd_map_iow
{
\c_@@_indent_str \c_@@_indent_str \c_@@_indent_str
- \seq_use:Nn \l_@@_sfd_line_seq { \or: }
+ \seq_use:Nn \l_@@_sfd_line_seq { ~ \or: } ~
\token_to_str:N \or:
}
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_write_plane_map:nn}
+% \begin{macro}{\@@_write_plane_map:nn}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_write_plane_map:nn #1#2
{
@@ -798,7 +802,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_write_cmap_file:n}
+% \begin{macro}{\@@_write_cmap_file:n}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_write_cmap_file:n #1
{
@@ -835,7 +839,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_write_cmap_body:n}
+% \begin{macro}{\@@_write_cmap_body:n}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_write_cmap_body:n #1
{
@@ -867,7 +871,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_write_sfd_map_header:n}
+% \begin{macro}{\@@_write_sfd_map_header:n}
% \begin{macrocode}
\group_begin:
\char_set_catcode_other:N \%
@@ -890,7 +894,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_write_sfd_map_trailer:n}
+% \begin{macro}{\@@_write_sfd_map_trailer:n}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_write_sfd_map_trailer:n #1
{
@@ -905,7 +909,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_write_cmap_header:nn}
+% \begin{macro}{\@@_write_cmap_header:nn}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_write_cmap_header:nn #1#2
{
@@ -935,7 +939,7 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_write_cmap_trailer:}
+% \begin{macro}{\@@_write_cmap_trailer:}
% \begin{macrocode}
\cs_new_protected_nopar:Npx \@@_write_cmap_trailer:
{
diff --git a/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins b/Master/texmf-dist/source/latex/xcjk2uni/xCJK2uni.ins
index 48606ab8c9d..172a5d9cfbf 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-2014, 2016 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com>
%% --------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -30,7 +30,7 @@
\preamble
- Copyright (C) 2013-2014, 2016 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com>
--------------------------------------------------------------------------
This work may be distributed and/or modified under the