Skip to content

Commit

Permalink
xCJK2uni: 删除 _nopar
Browse files Browse the repository at this point in the history
  • Loading branch information
@qinglee
qinglee committed Apr 7, 2020
1 parent 8dd19fc commit da6f40a
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions xCJK2uni/xCJK2uni.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,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> }
Expand Down Expand Up @@ -327,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}
Expand Down Expand Up @@ -363,7 +363,7 @@ 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 }
Expand All @@ -374,7 +374,7 @@ Copyright and Licence
{ \@@_input_sfd_map:n {#2} }
\cs_set_eq:Nc \@@_index_map:n { CJKtu_ #1 _index_map:n }
}
\cs_new_protected_nopar:Npn \@@_input_sfd_map:n #1
\cs_new_protected:Npn \@@_input_sfd_map:n #1
{
\group_begin:
\ExplSyntaxOn
Expand All @@ -386,7 +386,7 @@ Copyright and Licence
%
% \begin{macro}[int]{\CJKtu_index_map:n}
% \begin{macrocode}
\cs_new_nopar:Npn \CJKtu_index_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
Expand All @@ -410,14 +410,14 @@ Copyright and Licence
%
% \begin{macro}[int]{\CJKtu_sfd_map:nn}
% \begin{macrocode}
\cs_new_nopar:Npn \CJKtu_sfd_map:nn #1#2
\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_nopar:Npn \CJKtu_use_enc_map:n #1
\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 } }
Expand Down Expand Up @@ -446,7 +446,7 @@ Copyright and Licence
% \begin{macrocode}
\group_begin:
\char_set_catcode_active:n { "7F }
\cs_new_nopar:Npn \CJKtu_char_to_unicode:n #1
\cs_new:Npn \CJKtu_char_to_unicode:n #1
{
\int_compare:nNnTF { \tl_count:n {#1} } = 2
{ \CJKtu_byte:NN #1 }
Expand All @@ -456,16 +456,16 @@ 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 \@@_active_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 \@@_active_byte:Nwnw
\cs_set_eq:NN \CJK@XX \CJKtu_byte:NN
Expand All @@ -481,23 +481,23 @@ 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}
% \end{macro}
%
% \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 }
{
Expand All @@ -512,7 +512,7 @@ Copyright and Licence
}
{ \@@_encoding_error: }
}
\cs_new_nopar:Npn \@@_encoding_error:
\cs_new:Npn \@@_encoding_error:
{ \msg_expandable_error:nn { xCJK2uni } { encoding-error } }
\msg_new:nnn { xCJK2uni } { encoding-error }
{ Wrong~encoding~scheme. }
Expand All @@ -521,7 +521,7 @@ 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 \CJKtu_index_map:n
{
Expand All @@ -539,15 +539,15 @@ Copyright and Licence
%
% \begin{macro}{\@@_UTF_xvi_be_octal:n}
% \begin{macrocode}
\cs_new_nopar:Npn \@@_UTF_xvi_be_octal: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_nopar:Npn \@@_UTF_xvi_be_octal_aux:n #1
\cs_new:Npn \@@_UTF_xvi_be_octal_aux:n #1
{
\@@_UTF_xvi_be_octal:nn
{ \int_div_truncate:nn {#1} { 256 } }
{ \int_mod:nn {#1} { 256 } }
}
\cs_new_nopar:Npn \@@_UTF_xvi_be_octal:nn #1#2
\cs_new:Npn \@@_UTF_xvi_be_octal:nn #1#2
{
\HyPsd@DecimalToOctalFirst {#1}
\HyPsd@DecimalToOctalSecond {#2}
Expand Down Expand Up @@ -588,7 +588,7 @@ Copyright and Licence
%
% \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
{
Expand Down Expand Up @@ -687,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 }
Expand Down Expand Up @@ -720,14 +720,14 @@ Copyright and Licence
%
% \begin{macro}{\@@_read_sfd_line:n,\@@_read_sfd_line:nn}
% \begin{macrocode}
\cs_new_protected_nopar:Npx \@@_read_sfd_line:nn #1
\cs_new_protected:Npx \@@_read_sfd_line:nn #1
{
\exp_not:N \@@_read_sfd_line:nwn #1
\c_backslash_str \exp_not:N \q_nil \exp_not:N \q_stop
}
\use:e
{
\cs_new_protected_nopar:Npn \exp_not:N \@@_read_sfd_line:nwn
\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:nnnn
Expand All @@ -739,7 +739,7 @@ Copyright and Licence
%
% \begin{macro}{\@@_read_sfd_line:nnnnn}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_read_sfd_line:nnnn #1#2#3#4
\cs_new_protected:Npn \@@_read_sfd_line:nnnn #1#2#3#4
{
\tl_if_blank:nF {#1}
{
Expand All @@ -762,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
Expand Down Expand Up @@ -799,7 +799,7 @@ 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 } { } }
Expand Down Expand Up @@ -833,7 +833,7 @@ 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
{
Expand All @@ -847,7 +847,7 @@ 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
{
Expand All @@ -860,7 +860,7 @@ Copyright and Licence
%
% \begin{macro}{\@@_write_plane_map:n}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_write_plane_map:n #1
\cs_new_protected:Npn \@@_write_plane_map:n #1
{
\iow_now:Nx \g_@@_sfd_map_iow
{ %% ~ <#1> }
Expand All @@ -870,7 +870,7 @@ Copyright and Licence
%
% \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
{
Expand Down Expand Up @@ -900,7 +900,7 @@ 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
{
Expand Down

0 comments on commit da6f40a

Please sign in to comment.