summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/xcjk2uni
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-02 03:03:34 +0000
committerNorbert Preining <norbert@preining.info>2020-05-02 03:03:34 +0000
commit8626a9c3cb5dc8d02d779d5b5b1e3933d5626f43 (patch)
tree3cf05fd2ad850b994dafdcf497738d48a29634ca /macros/latex/contrib/xcjk2uni
parent7039906aa6676b98933cd099d1cb038f1644c18f (diff)
CTAN sync 202005020303
Diffstat (limited to 'macros/latex/contrib/xcjk2uni')
-rw-r--r--macros/latex/contrib/xcjk2uni/README.md6
-rw-r--r--macros/latex/contrib/xcjk2uni/xCJK2uni.dtx364
-rw-r--r--macros/latex/contrib/xcjk2uni/xCJK2uni.ins139
-rw-r--r--macros/latex/contrib/xcjk2uni/xCJK2uni.pdfbin129732 -> 126153 bytes
4 files changed, 165 insertions, 344 deletions
diff --git a/macros/latex/contrib/xcjk2uni/README.md b/macros/latex/contrib/xcjk2uni/README.md
index 26676edd3f..8f9535728f 100644
--- a/macros/latex/contrib/xcjk2uni/README.md
+++ b/macros/latex/contrib/xcjk2uni/README.md
@@ -19,12 +19,10 @@ Set the current encoding. The default encoding is GBK.
\CJKchartouni{<character>}
Convert a single CJK character to its Unicode.
-It requires two steps of expansion.
\CJKsfdtouni{<plane>}{<slot>}
Convert the .sfd coordinate to its Unicode.
-It requires two steps of expansion.
You can read the package manual (in Chinese) for more detailed explanations.
@@ -38,7 +36,7 @@ Issues and pull requests are welcome.
Copyright and Licence
---------------------
- Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2013-2014, 2016, 2018-2020 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -51,7 +49,7 @@ Copyright and Licence
and version 1.3 or later is part of all distributions of
LaTeX version 2005/12/01 or later.
- This work has the LPPL maintenance status `maintained'.
+ This work has the LPPL maintenance status "maintained".
The Current Maintainer of this work is Qing Lee.
diff --git a/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx b/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx
index 860d37f915..7a87a2a2b5 100644
--- a/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx
+++ b/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx
@@ -25,12 +25,10 @@ Set the current encoding. The default encoding is GBK.
\CJKchartouni{<character>}
Convert a single CJK character to its Unicode.
-It requires two steps of expansion.
\CJKsfdtouni{<plane>}{<slot>}
Convert the .sfd coordinate to its Unicode.
-It requires two steps of expansion.
You can read the package manual (in Chinese) for more detailed explanations.
@@ -44,7 +42,7 @@ Issues and pull requests are welcome.
Copyright and Licence
---------------------
- Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2013-2014, 2016, 2018-2020 by Qing Lee <sobenlee@gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -57,7 +55,7 @@ Copyright and Licence
and version 1.3 or later is part of all distributions of
LaTeX version 2005/12/01 or later.
- This work has the LPPL maintenance status `maintained'.
+ This work has the LPPL maintenance status "maintained".
The Current Maintainer of this work is Qing Lee.
@@ -89,7 +87,7 @@ Copyright and Licence
\preamble
- Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com>
+ Copyright (C) 2013-2014, 2016, 2018-2020 by Qing Lee <sobenlee@gmail.com>
--------------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -102,7 +100,7 @@ Copyright and Licence
and version 1.3 or later is part of all distributions of
LaTeX version 2005/12/01 or later.
- This work has the LPPL maintenance status `maintained'.
+ This work has the LPPL maintenance status "maintained".
The Current Maintainer of this work is Qing Lee.
@@ -192,7 +190,7 @@ Copyright and Licence
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\RequirePackage{expl3}
%<make>\input expl3-generic %
-%<+package|make|def>\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+package|make|def>\GetIdInfo$Id: xCJK2uni.dtx daef005 2020-05-01 21:09:45 +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
@@ -202,7 +200,7 @@ Copyright and Licence
%<make>\cs_if_exist:NF \ProvidesExplFile
%<make> {
%<make> \group_begin:
-%<make> \cs_set_nopar:Npn \ProvidesExplFile #1#2#3#4
+%<make> \cs_set:Npn \ProvidesExplFile #1#2#3#4
%<make> { \iow_log:x { File:~#1~#2~v#3~#4 } }
%<make> \exp_after:wN \group_end:
%<make> }
@@ -214,7 +212,7 @@ Copyright and Licence
%<JIS>\ProvidesExplFile{xCJK2uni-UJIS.def}
%<KS>\ProvidesExplFile{xCJK2uni-UKS.def}
%<*driver|package|make|def>
- {\ExplFileDate}{0.8}{\ExplFileDescription}
+ {\ExplFileDate}{1.0}{\ExplFileDescription}
%</driver|package|make|def>
%<*driver>
\documentclass{ctxdoc}
@@ -226,7 +224,7 @@ Copyright and Licence
%</driver>
% \fi
%
-% \CheckSum{585}
+% \CheckSum{532}
% \GetFileId{xCJK2uni.sty}
%
% \title{\bfseries\pkg{xCJK2uni} 宏包}
@@ -264,8 +262,7 @@ Copyright and Licence
% \begin{syntax}
% \cs{CJKchartouni} \Arg{单个CJK文字}
% \end{syntax}
-% 将文字转换成 $16$ 进制形式的 Unicode。例如 |\CJKchartouni{一}| 将得到 |4E00|。
-% 将它展开两次就可以得到结果。
+% 将文字转换成 Unicode。例如 |\CJKchartouni{一}| 将得到 \texttt{\number\string"4E00 }。
% \end{function}
%
% \begin{function}[EXP]{\CJKsfdtouni}
@@ -273,8 +270,8 @@ Copyright and Licence
% \cs{CJKsfdtouni} \Arg{plane} \Arg{slot}
% \end{syntax}
% \meta{plane} 表示由 \file{.sfd} 文件定义的子字体的编号,\meta{slot} 表示在
-% 子字体中的位置,这个命令将得到该坐标位置的 Unicode。将它展开两次就可以得到结果。
-% 如果在当前编码下,该坐标位置不合法,将展开为空。
+% 子字体中的位置,这个命令将得到该坐标位置的 Unicode。
+% 如果在当前编码下,该坐标位置不合法,将展开为空并报错。
% \end{function}
%
% \end{documentation}
@@ -300,7 +297,7 @@ Copyright and Licence
'l3kernel'~and~'l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2019/03/05 } { }
+\@ifpackagelater { expl3 } { 2020/03/06 } { }
{ \msg_error:nn { xCJK2uni } { l3-too-old } }
% \end{macrocode}
%
@@ -330,7 +327,7 @@ Copyright and Licence
%
% \begin{macro}{\@@_set_enc:nnnnnn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_set_enc:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \@@_set_enc:nnnnnn #1#2#3#4#5#6
{
\seq_gput_right:Nn \c_@@_encoding_seq {#1}
\prop_gput:Nnn \c_@@_sfd_prop {#1} {#2}
@@ -366,25 +363,63 @@ Copyright and Licence
%
% \begin{macro}{\@@_enc_map:nn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_enc_map:nn #1#2
+\cs_new_protected:Npn \@@_enc_map:nn #1#2
{
\int_set_eq:Nc \l_@@_i_min_int { c_@@_ #1 _i_min_int }
\int_set_eq:Nc \l_@@_ii_min_int { c_@@_ #1 _ii_min_int }
\int_set_eq:Nc \l_@@_gap_begin_int { c_@@_ #1 _gap_begin_int }
\int_set_eq:Nc \l_@@_gap_end_int { c_@@_ #1 _gap_end_int }
\int_set_eq:Nc \l_@@_plane_int { c_@@_ #1 _plane_int }
- \cs_if_exist:cF { CJKtu_ #1 _sfd_map:nn }
- { \group_begin: \file_input:n { xCJK2uni-#2.def } \group_end: }
- \cs_set_eq:Nc \CJKtu_sfd_map:nn { CJKtu_ #1 _sfd_map:nn }
+ \cs_if_exist:cF { CJKtu_ #1 _index_map:n }
+ { \@@_input_sfd_map:n {#2} }
+ \cs_set_eq:Nc \@@_index_map:n { CJKtu_ #1 _index_map:n }
+ }
+\cs_new_protected:Npn \@@_input_sfd_map:n #1
+ {
+ \group_begin:
+ \ExplSyntaxOn
+ \file_input:n { xCJK2uni-#1.def }
+ \group_end:
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_use_enc_map:n}
+% \begin{macro}[int]{\CJKtu_index_map:n}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_use_enc_map:n #1
+\cs_new:Npn \CJKtu_index_map:n #1
+ { \CJKtu_unicode:n { \@@_index_map:n {#1} } }
+\cs_new_eq:NN \CJKtu_unicode:n \use:n
+\cs_new_eq:NN \@@_index_map:n \use_none:n
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[int]{\CJKtu_index_map:nn}
+% \begin{macrocode}
+\cs_new_protected:Npn \CJKtu_index_map:nn #1
+ {
+ \exp_args:Ncc \@@_index_map_aux:NNn
+ { CJKtu_ #1 _index_map:n } { c_@@_ #1 _intarray }
+ }
+\cs_new_protected:Npn \@@_index_map_aux:NNn #1#2
{
- \prop_get:NxNTF \c_@@_sfd_prop {#1} \l_@@_sfd_tl
+ \cs_new:Npn #1 ##1 { \intarray_item:Nn #2 { ##1 + 1 } }
+ \intarray_const_from_clist:Nn #2
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[int]{\CJKtu_sfd_map:nn}
+% \begin{macrocode}
+\cs_new:Npn \CJKtu_sfd_map:nn #1#2
+ { \CJKtu_index_map:n { ( #1 - 1 ) * 256 + (#2) } }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[int]{\CJKtu_use_enc_map:n}
+% \begin{macrocode}
+\cs_new_protected:Npn \CJKtu_use_enc_map:n #1
+ {
+ \prop_get:NnNTF \c_@@_sfd_prop {#1} \l_@@_sfd_tl
{ \@@_enc_map:nn {#1} { \l_@@_sfd_tl } }
{ \msg_error:nnx { xCJK2uni } { invalid-encoding } {#1} }
}
@@ -394,7 +429,7 @@ Copyright and Licence
Only~\seq_use:Nnnn \c_@@_encoding_seq { ~and~ } { ,~ } { ,~and~ } ~
are~supported.
}
-\prg_generate_conditional_variant:Nnn \prop_get:NnN { Nx } { TF }
+\cs_generate_variant:Nn \CJKtu_use_enc_map:n { x }
% \end{macrocode}
% \end{macro}
%
@@ -407,36 +442,12 @@ Copyright and Licence
\@@_set_enc:nnnnnn { GBK } { UGBK } { "81 } { "40 } { "7E } { "80 }
% \end{macrocode}
%
-% \begin{macro}{\@@_sfd_to_unicode:nn}
-% \begin{macrocode}
-\cs_new_nopar:Npn \@@_sfd_to_unicode:nn #1#2
- {
- \exp:w \exp_last_unbraced:Nf
- \@@_get_unicode:w \CJKtu_sfd_map:nn {#1} {#2} \exp_end:
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_get_unicode:w}
-% \begin{macrocode}
-\cs_new_nopar:Npn \@@_get_unicode:w #1 \exp_end:
- {
- \tl_if_empty:nTF {#1}
- { \exp_end: }
- { \@@_get_unicode_aux:w #1 \q_stop }
- }
-\cs_new_nopar:Npn \@@_get_unicode_aux:w #1 \or: #2 \q_stop
- { \or: #2 \exp_end: #1 }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_char_to_unicode:n}
+% \begin{macro}[int]{\CJKtu_char_to_unicode:n}
% \begin{macrocode}
\group_begin:
\char_set_catcode_active:n { "7F }
-\cs_new_nopar:Npn \@@_char_to_unicode:n #1
+\cs_new:Npn \CJKtu_char_to_unicode:n #1
{
- \exp:w
\int_compare:nNnTF { \tl_count:n {#1} } = 2
{ \CJKtu_byte:NN #1 }
{
@@ -445,23 +456,23 @@ Copyright and Licence
{ \@@_encoding_error: }
}
}
-\cs_new_nopar:Npn \@@_byte:wNwnw ^^7f #1 ^^7f #2 ^^7f
+\cs_new:Npn \@@_byte:wNwnw ^^7f #1 ^^7f #2 ^^7f
{ \CJKtu_byte_map:nn { `#1 } {#2} }
-\cs_new_nopar:Npn \@@_byte:Nwnw #1 ^^7f #2 ^^7f
+\cs_new:Npn \@@_active_byte:Nwnw #1 ^^7f #2 ^^7f
{ \CJKtu_byte_map:nn { `#1 } {#2} }
% \end{macrocode}
% \end{macro}
%
% \begin{macro}[int]{\CJKtu_bookmarks_hook:}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \CJKtu_bookmarks_hook:
+\cs_new_protected:Npn \CJKtu_bookmarks_hook:
{
- \cs_set_eq:NN ^^7f \@@_byte:Nwnw
- \cs_set_eq:NN \CJK@XX \CJKtu_byte:NN
- \cs_set_eq:NN \CJKchar \@@_byte:wnn
- \cs_set_eq:NN \CCTchar \CJKtu_byte:nn
- \cs_set_eq:NN \@CCTSetChar \@@_CCT_byte:NNN
- \cs_set_eq:NN \@@_get_unicode:n \@@_UTF_xvi_be:n
+ \cs_set_eq:NN ^^7f \@@_active_byte:Nwnw
+ \cs_set_eq:NN \CJK@XX \CJKtu_byte:NN
+ \cs_set_eq:NN \CJKchar \@@_byte:wnn
+ \cs_set_eq:NN \CCTchar \CJKtu_byte:nn
+ \cs_set_eq:NN \@CCTSetChar \@@_CCT_byte:NNN
+ \cs_set_eq:NN \CJKtu_unicode:n \@@_UTF_xvi_be_octal:n
}
\group_end:
% \end{macrocode}
@@ -470,9 +481,9 @@ Copyright and Licence
% \begin{macro}[int]{\CJKtu_byte:NN}
% \begin{macro}{\@@_CCT_byte:NNN}
% \begin{macrocode}
-\cs_new_nopar:Npn \CJKtu_byte:NN #1#2
+\cs_new:Npn \CJKtu_byte:NN #1#2
{ \CJKtu_byte:nn { `#1 } { `#2 } }
-\cs_new_nopar:Npn \@@_CCT_byte:NNN #1#2#3
+\cs_new:Npn \@@_CCT_byte:NNN #1#2#3
{ \CJKtu_byte:nn { `#1 } { `#3 } }
% \end{macrocode}
% \end{macro}
@@ -480,13 +491,13 @@ Copyright and Licence
%
% \begin{macro}{\@@_byte:wnn}
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_byte:wnn #1# { \CJKtu_byte:nn }
+\cs_new:Npn \@@_byte:wnn #1# { \CJKtu_byte:nn }
% \end{macrocode}
% \end{macro}
%
% \begin{macro}[int]{\CJKtu_byte:nn}
% \begin{macrocode}
-\cs_new_nopar:Npn \CJKtu_byte:nn #1#2
+\cs_new:Npn \CJKtu_byte:nn #1#2
{
\int_compare:nTF { \l_@@_i_min_int <= #1 <= \l_@@_i_max_int }
{
@@ -501,11 +512,8 @@ Copyright and Licence
}
{ \@@_encoding_error: }
}
-\cs_new_nopar:Npn \@@_encoding_error:
- {
- \msg_expandable_error:nn { xCJK2uni } { encoding-error }
- \exp_end:
- }
+\cs_new:Npn \@@_encoding_error:
+ { \msg_expandable_error:nn { xCJK2uni } { encoding-error } }
\msg_new:nnn { xCJK2uni } { encoding-error }
{ Wrong~encoding~scheme. }
% \end{macrocode}
@@ -513,9 +521,9 @@ Copyright and Licence
%
% \begin{macro}[int]{\CJKtu_byte_map:nn}
% \begin{macrocode}
-\cs_new_nopar:Npn \CJKtu_byte_map:nn #1#2
+\cs_new:Npn \CJKtu_byte_map:nn #1#2
{
- \exp_args:Nf \@@_index_map:n
+ \exp_args:Nf \CJKtu_index_map:n
{
\int_eval:n
{
@@ -529,38 +537,21 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_index_map:n}
+% \begin{macro}{\@@_UTF_xvi_be_octal:n}
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_index_map:n #1
+\cs_new:Npn \@@_UTF_xvi_be_octal:n #1
+ { \exp_args:Nf \@@_UTF_xvi_be_octal_aux:n { \int_eval:n {#1} } }
+\cs_new:Npn \@@_UTF_xvi_be_octal_aux:n #1
{
- \@@_get_unicode:n
- {
- \CJKtu_sfd_map:nn
- { \int_div_truncate:nn {#1} { 256 } + 1 }
- { \int_mod:nn {#1} { 256 } }
- }
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \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}{\@@_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 } } }
-\cs_new_nopar:Npn \@@_UTF_xvi_aux:n #1
- {
- \HyPsd@DecimalToOctalFirst
+ \@@_UTF_xvi_be_octal:nn
{ \int_div_truncate:nn {#1} { 256 } }
- \HyPsd@DecimalToOctalSecond
{ \int_mod:nn {#1} { 256 } }
}
+\cs_new:Npn \@@_UTF_xvi_be_octal:nn #1#2
+ {
+ \HyPsd@DecimalToOctalFirst {#1}
+ \HyPsd@DecimalToOctalSecond {#2}
+ }
% \end{macrocode}
% \end{macro}
%
@@ -589,29 +580,31 @@ Copyright and Licence
%
% \begin{macro}{\useCJKencmap,\CJKchartouni,\CJKsfdtouni}
% \begin{macrocode}
-\cs_new_eq:NN \useCJKencmap \@@_use_enc_map:n
-\cs_new_eq:NN \CJKchartouni \@@_char_to_unicode:n
-\cs_new_eq:NN \CJKsfdtouni \@@_sfd_to_unicode:nn
+\cs_new_eq:NN \useCJKencmap \CJKtu_use_enc_map:x
+\cs_new_eq:NN \CJKchartouni \CJKtu_char_to_unicode:n
+\cs_new_eq:NN \CJKsfdtouni \CJKtu_sfd_map:nn
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@@_initial:N}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_initial:N #1
+\cs_new_protected:Npn \@@_initial:N #1
{
\tl_if_exist:NTF #1
{
\prop_get:NxNTF \c_@@_sfd_prop {#1} \l_@@_sfd_tl
{ \@@_enc_map:nn {#1} { \l_@@_sfd_tl } }
- { \@@_use_enc_map:n { GBK } }
+ { \CJKtu_use_enc_map:n { GBK } }
}
- { \@@_use_enc_map:n { GBK } }
+ { \CJKtu_use_enc_map:n { GBK } }
}
+\prg_generate_conditional_variant:Nnn \prop_get:NnN { Nx } { TF }
% \end{macrocode}
% \end{macro}
%
% \begin{macrocode}
-\exp_args:Nc \@@_initial:N { CJK @ @ @ enc }
+\group_begin: \exp_args:NNc \group_end:
+\@@_initial:N { CJK @ @ @ enc }
% \end{macrocode}
%
% \begin{macrocode}
@@ -641,7 +634,7 @@ Copyright and Licence
{
\lua_now:e
{
- kpse.set_program_name("kpsewhich") ~
+ kpse.set_program_name("luatex") ~
local ~ sfd = kpse.find_file("UGBK.sfd", "subfont~definition~files") ~
if ~ sfd ~ then ~
tex.write(sfd) ~
@@ -650,7 +643,7 @@ Copyright and Licence
}
}
{
- \sys_shell_get:nnNTF { kpsewhich ~ UGBK.sfd } { } \l_tmpa_str
+ \sys_get_shell:nnNTF { kpsewhich ~ UGBK.sfd } { } \l_tmpa_str
{ \str_gset_eq:NN \g_@@_path_str \l_tmpa_str }
{ \msg_fatal:nnnn { xCJK2uni } { file-not-found } { GBK } { UGBK.sfd } }
}
@@ -694,7 +687,7 @@ Copyright and Licence
%
% \begin{macro}{\@@_write_file:nnn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_write_file:nnn #1#2#3
+\cs_new_protected:Npn \@@_write_file:nnn #1#2#3
{
\group_begin:
\seq_put_right:No \l_file_search_path_seq { \g_@@_path_str }
@@ -704,19 +697,14 @@ Copyright and Licence
\seq_clear:N \l_@@_sfd_plane_seq
\@@_write_sfd_map_header:n {#1}
\ior_str_map_inline:Nn \g_@@_sfd_ior
- { \str_if_eq:nnT {##1} { 00 ~ 0x0000_0x00FF } { \ior_map_break: } }
+ { \str_if_eq:nnT { ##1 } { 00 ~ 0x0000_0x00FF } { \ior_map_break: } }
\ior_str_map_inline:Nn \g_@@_sfd_ior
{
- \tl_if_blank:nTF {##1}
- {
- \ior_map_break:n
- {
- \@@_write_sfd_map_trailer:n {#1}
- \@@_write_cmap_file:n {#2}
- }
- }
- { \@@_read_sfd_line:nnn {##1} {#1} {#2} }
+ \tl_if_blank:nT { ##1 } { \ior_map_break: }
+ \@@_read_sfd_line:nn { ##1 } {#2}
}
+ \@@_write_sfd_map_trailer:n {#1}
+ \@@_write_cmap_file:n {#2}
\iow_close:N \g_@@_sfd_cmap_iow
\ior_close:N \g_@@_sfd_ior
\seq_clear:N \l_@@_sfd_plane_seq
@@ -732,19 +720,18 @@ Copyright and Licence
%
% \begin{macro}{\@@_read_sfd_line:n,\@@_read_sfd_line:nn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npx \@@_read_sfd_line:nnn #1#2#3
+\cs_new_protected:Npx \@@_read_sfd_line:nn #1
{
- \exp_not:N \@@_read_sfd_line:nwnn #1
- \c_backslash_str \exp_not:N \q_nil \exp_not:N \q_stop {#2} {#3}
+ \exp_not:N \@@_read_sfd_line:nwn #1
+ \c_backslash_str \exp_not:N \q_nil \exp_not:N \q_stop
}
-\use:x
+\use:e
{
- \cs_new_protected_nopar:Npn \exp_not:N \@@_read_sfd_line:nwnn
- ##1 0 \token_to_str:N x ##2 \c_backslash_str ##3 \exp_not:N \q_stop
- ##4##5
+ \cs_new_protected:Npn \exp_not:N \@@_read_sfd_line:nwn
+ #1 0 \token_to_str:N x #2 \c_backslash_str #3 \exp_not:N \q_stop
{
- \exp_not:N \@@_read_sfd_line:nnnnn
- {##1} { 0 \token_to_str:N x } {##2} {##4} {##5}
+ \exp_not:N \@@_read_sfd_line:nnnn
+ {#1} { 0 \token_to_str:N x } {#2}
}
}
% \end{macrocode}
@@ -752,48 +739,22 @@ Copyright and Licence
%
% \begin{macro}{\@@_read_sfd_line:nnnnn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_read_sfd_line:nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \@@_read_sfd_line:nnnn #1#2#3#4
{
\tl_if_blank:nF {#1}
{
\seq_if_empty:NF \l_@@_sfd_plane_seq
- {
- \iow_now:Nx \g_@@_sfd_map_iow
- {
- \c_@@_indent_str \c_@@_indent_str
- \token_to_str:N \fi: \iow_newline:
- \c_@@_indent_str \c_right_brace_str
- }
- \@@_write_cmap_file:n {#5}
- }
- \@@_write_plane_map:nn {#1} {#4}
+ { \@@_write_cmap_file:n {#4} }
\tl_set:Nx \l_@@_sfd_plane_tl { \tl_trim_spaces:n {#1} }
+ \@@_write_plane_map:n { \l_@@_sfd_plane_tl }
}
\seq_set_split:Nnn \l_@@_sfd_line_seq {#2} {#3}
\seq_concat:NNN \l_@@_sfd_plane_seq
\l_@@_sfd_plane_seq \l_@@_sfd_line_seq
\iow_now:Nx \g_@@_sfd_map_iow
{
- \c_@@_indent_str \c_@@_indent_str \c_@@_indent_str
- \seq_use:Nn \l_@@_sfd_line_seq { ~ \or: } ~
- \token_to_str:N \or:
- }
- }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_write_plane_map:nn}
-% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_write_plane_map:nn #1#2
- {
- \iow_now:Nx \g_@@_sfd_map_iow
- {
- \cs_new_nopar:cpn { ~ @@_ #2 _sfd_map_ \int_eval:n {#1} :n ~ } ~
- \c_hash_str 1 \iow_newline:
- \c_@@_indent_str \c_left_brace_str \iow_newline:
\c_@@_indent_str \c_@@_indent_str
- \exp_not:N \if_case:w \tex_numexpr:D
- \c_hash_str 1 ~ \token_to_str:N \scan_stop:
+ " \seq_use:Nn \l_@@_sfd_line_seq { ~ , ~ " } ~ ,
}
}
% \end{macrocode}
@@ -801,7 +762,7 @@ Copyright and Licence
%
% \begin{macro}{\@@_write_cmap_file:n}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_write_cmap_file:n #1
+\cs_new_protected:Npn \@@_write_cmap_file:n #1
{
\tl_clear:N \l_@@_cmap_block_tl
\int_zero:N \l_@@_sfd_index_int
@@ -809,13 +770,13 @@ Copyright and Licence
\@@_write_cmap_header:nn { C #1 } { \l_@@_sfd_plane_tl }
\iow_now:Nx \g_@@_sfd_cmap_iow
{
- \iow_newline:
- 1~begincodespacerange \iow_newline:
+ \iow_newline:
+ 1~begincodespacerange \iow_newline:
\c_@@_indent_str < 00 > ~
<
\int_to_Hex:n
{ \seq_count:N \l_@@_sfd_plane_seq - 1 }
- > \iow_newline:
+ > \iow_newline:
endcodespacerange
}
\seq_map_function:NN \l_@@_sfd_plane_seq \@@_write_cmap_body:n
@@ -823,9 +784,9 @@ Copyright and Licence
{
\iow_now:Nx \g_@@_sfd_cmap_iow
{
- \iow_newline:
+ \iow_newline:
\int_mod:nn { \l_@@_sfd_index_int } { 100 } ~
- beginbfchar \iow_newline:
+ beginbfchar \iow_newline:
\l_@@_cmap_block_tl
endbfchar
}
@@ -838,18 +799,18 @@ Copyright and Licence
%
% \begin{macro}{\@@_write_cmap_body:n}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_write_cmap_body:n #1
+\cs_new_protected:Npn \@@_write_cmap_body:n #1
{
\int_case:nnTF { \l_@@_sfd_index_int }
{ { 99 } { } { 199 } { } }
{
\iow_now:Nx \g_@@_sfd_cmap_iow
{
- \iow_newline:
- 100 ~ beginbfchar \iow_newline:
+ \iow_newline:
+ 100 ~ beginbfchar \iow_newline:
\l_@@_cmap_block_tl
< \int_to_Hex:n { \l_@@_sfd_index_int } > ~
- <#1> \iow_newline:
+ <#1> \iow_newline:
endbfchar
}
\tl_clear:N \l_@@_cmap_block_tl
@@ -860,7 +821,7 @@ Copyright and Licence
<
\int_compare:nNnF \l_@@_sfd_index_int > { 15 } { 0 }
\int_to_Hex:n { \l_@@_sfd_index_int }
- > ~ <#1> \iow_newline:
+ > ~ <#1> \iow_newline:
}
}
\int_incr:N \l_@@_sfd_index_int
@@ -872,20 +833,13 @@ Copyright and Licence
% \begin{macrocode}
\group_begin:
\char_set_catcode_other:N \%
-\cs_new_protected_nopar:Npn \@@_write_sfd_map_header:n #1
+\cs_new_protected:Npn \@@_write_sfd_map_header:n #1
{
\iow_now:Nx \g_@@_sfd_map_iow
{
- %<*#1> \iow_newline:
- \cs_new_nopar:cpn { ~ CJKtu_#1_sfd_map:nn ~ } ~ \c_hash_str 1
- \iow_newline: \c_@@_indent_str \c_left_brace_str \iow_newline:
- \c_@@_indent_str \c_@@_indent_str
- \token_to_str:N \cs_if_exist_use:cF
- \iow_newline: \c_@@_indent_str \c_@@_indent_str \c_@@_indent_str
- { ~ @@_#1_sfd_map_ ~ \exp_not:N \int_eval:n { \c_hash_str 1 } ~ :n ~}
- \iow_newline: \c_@@_indent_str \c_@@_indent_str \c_@@_indent_str
- { ~ \exp_not:N \use_none:n } \iow_newline:
- \c_@@_indent_str \c_right_brace_str
+ %<*#1> \iow_newline:
+ \exp_not:N \CJKtu_index_map:nn { ~ #1 ~ } \iow_newline:
+ \c_@@_indent_str \c_left_brace_str
}
}
% \end{macrocode}
@@ -893,22 +847,30 @@ Copyright and Licence
%
% \begin{macro}{\@@_write_sfd_map_trailer:n}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_write_sfd_map_trailer:n #1
+\cs_new_protected:Npn \@@_write_sfd_map_trailer:n #1
{
\iow_now:Nx \g_@@_sfd_map_iow
{
- \c_@@_indent_str \c_@@_indent_str
- \token_to_str:N \fi: \iow_newline:
- \c_@@_indent_str \c_right_brace_str \iow_newline:
+ \c_@@_indent_str \c_right_brace_str \iow_newline:
%</#1>
}
}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@@_write_plane_map:n}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_write_plane_map:n #1
+ {
+ \iow_now:Nx \g_@@_sfd_map_iow
+ { %% ~ <#1> }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_write_cmap_header:nn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_write_cmap_header:nn #1#2
+\cs_new_protected:Npn \@@_write_cmap_header:nn #1#2
{
\iow_now:Nx \g_@@_sfd_cmap_iow
{
@@ -919,17 +881,17 @@ Copyright and Licence
%%Title:~(TeX-#1-#2-0~TeX~#1-#2~0) \iow_newline:
%%Version:~1.000 \iow_newline:
%%EndComments \iow_newline: \iow_newline:
- /CIDInit~/ProcSet~findresource~begin \iow_newline: \iow_newline:
- 12~dict~begin \iow_newline: \iow_newline:
- begincmap \iow_newline: \iow_newline:
- /CIDSystemInfo~3~dict~dup~begin \iow_newline:
- \c_@@_indent_str /Registry~(TeX)~def \iow_newline:
- \c_@@_indent_str /Ordering~(#1-#2)~def \iow_newline:
- \c_@@_indent_str /Supplement~0~def \iow_newline:
- end~def \iow_newline: \iow_newline:
- /CMapName~/TeX-#1-#2-0~def \iow_newline:
- /CMapVersion~1.000~def \iow_newline:
- /CMapType~2~def \iow_newline: \iow_newline:
+ /CIDInit~/ProcSet~findresource~begin \iow_newline: \iow_newline:
+ 12~dict~begin \iow_newline: \iow_newline:
+ begincmap \iow_newline: \iow_newline:
+ /CIDSystemInfo~3~dict~dup~begin \iow_newline:
+ \c_@@_indent_str /Registry~(TeX)~def \iow_newline:
+ \c_@@_indent_str /Ordering~(#1-#2)~def \iow_newline:
+ \c_@@_indent_str /Supplement~0~def \iow_newline:
+ end~def \iow_newline: \iow_newline:
+ /CMapName~/TeX-#1-#2-0~def \iow_newline:
+ /CMapVersion~1.000~def \iow_newline:
+ /CMapType~2~def \iow_newline: \iow_newline:
/WMode~0~def
}
}
@@ -938,16 +900,16 @@ Copyright and Licence
%
% \begin{macro}{\@@_write_cmap_trailer:}
% \begin{macrocode}
-\cs_new_protected_nopar:Npx \@@_write_cmap_trailer:
+\cs_new_protected:Npx \@@_write_cmap_trailer:
{
\iow_now:Nn \g_@@_sfd_cmap_iow
{
- \iow_newline:
- endcmap \iow_newline:
- CMapName~currentdict~/CMap~defineresource~pop \iow_newline:
- end \iow_newline:
- end \iow_newline: \iow_newline:
- %%EndResource \iow_newline:
+ \iow_newline:
+ endcmap \iow_newline:
+ CMapName~currentdict~/CMap~defineresource~pop \iow_newline:
+ end \iow_newline:
+ end \iow_newline: \iow_newline:
+ %%EndResource \iow_newline:
%%EOF
}
}
diff --git a/macros/latex/contrib/xcjk2uni/xCJK2uni.ins b/macros/latex/contrib/xcjk2uni/xCJK2uni.ins
deleted file mode 100644
index 31967db2ee..0000000000
--- a/macros/latex/contrib/xcjk2uni/xCJK2uni.ins
+++ /dev/null
@@ -1,139 +0,0 @@
-%%
-%% This is file `xCJK2uni.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% xCJK2uni.dtx (with options: `install')
-%%
-%% Copyright (C) 2013-2014, 2016, 2018-2019 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.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%% http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainer of this work is Qing Lee.
-%%
-%% --------------------------------------------------------------------------
-%%
-
-\input ctxdocstrip %
-
-\preamble
-
- Copyright (C) 2013-2014, 2016, 2018-2019 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.3c of this license or (at your option) any later
- version. This version of this license is in
- http://www.latex-project.org/lppl/lppl-1-3c.txt
- and the latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of
- LaTeX version 2005/12/01 or later.
-
- This work has the LPPL maintenance status `maintained'.
-
- The Current Maintainer of this work is Qing Lee.
-
---------------------------------------------------------------------------
-
-\endpreamble
-\postamble
-
- This package consists of the file xCJK2uni.dtx,
- and the derived files xCJK2uni.pdf,
- xCJK2uni.sty,
- xCJK2uni.ins,
- xCJK2uni-make.tex,
- xCJK2uni-sfd.def,
- xCJK2uni-UBg5plus.def,
- xCJK2uni-UBig5.def,
- xCJK2uni-UGB.def,
- xCJK2uni-UGBK.def,
- xCJK2uni-UJIS.def,
- xCJK2uni-UKS.def,
- c****.cmap, and
- README.md.
-\endpostamble
-
-\generate
- {
- \usedir{tex/latex/xcjk2uni}
- \file{xCJK2uni.sty} {\from{\jobname.dtx}{package}}
- \file{xCJK2uni-make.tex} {\from{\jobname.dtx}{make}}
- \nopreamble\nopostamble
- \usedir{doc/latex/xcjk2uni}
- \file{README.md} {\from{\jobname.dtx}{readme}}
- }
-
-\let\input\@@input
-\def\CJKtuend{\ExplSyntaxOff}
-\input xCJK2uni-make %
-\let\input\skip@input
-
-\generate
- {
- \usedir{tex/latex/xcjk2uni}
- \usepostamble\emptypostamble
- \file{xCJK2uni-UBig5.def}
- {
- \from{\jobname.dtx} {def,Bg5}
- \from{xCJK2uni-sfd.def} {Bg5}
- }
- \file{xCJK2uni-UBg5plus.def}
- {
- \from{\jobname.dtx} {def,Bg5+}
- \from{xCJK2uni-sfd.def} {Bg5+}
- }
- \file{xCJK2uni-UGB.def}
- {
- \from{\jobname.dtx} {def,GB}
- \from{xCJK2uni-sfd.def} {GB}
- }
- \file{xCJK2uni-UGBK.def}
- {
- \from{\jobname.dtx} {def,GBK}
- \from{xCJK2uni-sfd.def} {GBK}
- }
- \file{xCJK2uni-UJIS.def}
- {
- \from{\jobname.dtx} {def,JIS}
- \from{xCJK2uni-sfd.def} {JIS}
- }
- \file{xCJK2uni-UKS.def}
- {
- \from{\jobname.dtx} {def,KS}
- \from{xCJK2uni-sfd.def} {KS}
- }
- }
-
-\endbatchfile
-%%
-%% This package consists of the file xCJK2uni.dtx,
-%% and the derived files xCJK2uni.pdf,
-%% xCJK2uni.sty,
-%% xCJK2uni.ins,
-%% xCJK2uni-make.tex,
-%% xCJK2uni-sfd.def,
-%% xCJK2uni-UBg5plus.def,
-%% xCJK2uni-UBig5.def,
-%% xCJK2uni-UGB.def,
-%% xCJK2uni-UGBK.def,
-%% xCJK2uni-UJIS.def,
-%% xCJK2uni-UKS.def,
-%% c****.cmap, and
-%% README.md.
-%%
-%% End of file `xCJK2uni.ins'.
diff --git a/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf b/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf
index d2ba50e042..b143ba1467 100644
--- a/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf
+++ b/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf
Binary files differ