diff options
author | Norbert Preining <norbert@preining.info> | 2020-05-03 03:02:51 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-05-03 03:02:51 +0000 |
commit | d78de17ddf0443233483fd98f40802cae5aa87c5 (patch) | |
tree | 1b7128cc505808a09c18e158288d6c3cdcf5c2fb /language/chinese | |
parent | 8626a9c3cb5dc8d02d779d5b5b1e3933d5626f43 (diff) |
CTAN sync 202005030302
Diffstat (limited to 'language/chinese')
-rw-r--r-- | language/chinese/ctex/README.md | 6 | ||||
-rw-r--r-- | language/chinese/ctex/ctex-zhconv-make.lua (renamed from language/chinese/ctex/zhconv-make.lua) | 14 | ||||
-rw-r--r-- | language/chinese/ctex/ctex-zhconv.lua (renamed from language/chinese/ctex/zhconv.lua) | 17 | ||||
-rw-r--r-- | language/chinese/ctex/ctex.dtx | 37 | ||||
-rw-r--r-- | language/chinese/ctex/ctex.pdf | bin | 1097730 -> 1097692 bytes | |||
-rw-r--r-- | language/chinese/ctex/ctxdocstrip.tex | 8 |
6 files changed, 41 insertions, 41 deletions
diff --git a/language/chinese/ctex/README.md b/language/chinese/ctex/README.md index ae64dbcadd..83399cecd5 100644 --- a/language/chinese/ctex/README.md +++ b/language/chinese/ctex/README.md @@ -49,8 +49,8 @@ Copyright and Licence This package consists of the files ctex.dtx, ctxdoc.cls, ctxdocstrip.tex, - zhconv.lua, - zhconv-make.lua, + ctex-zhconv.lua, + ctex-zhconv-make.lua, and the derived files ctex.pdf, ctex.ins, ctex.sty, @@ -119,7 +119,7 @@ Copyright and Licence zhmacfonts.tex, zhubuntufonts.tex, zhwindowsfonts.tex, - zhconv-index.lua, + ctex-zhconv-index.lua, translator-theorem-dictionary-ChineseGBK.dict, translator-theorem-dictionary-ChineseUTF8.dict, and README.md (this file). diff --git a/language/chinese/ctex/zhconv-make.lua b/language/chinese/ctex/ctex-zhconv-make.lua index fe6f00feaa..4b6f1bf8a4 100644 --- a/language/chinese/ctex/zhconv-make.lua +++ b/language/chinese/ctex/ctex-zhconv-make.lua @@ -1,6 +1,6 @@ #!/usr/bin/env texlua -- --- File zhconv-make.lua +-- File ctex-zhconv-make.lua -- -- Copyright (C) 2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- @@ -19,15 +19,15 @@ -- -- The Current Maintainer of this work is Qing Lee. -- --- This work consists of the files zhconv.lua, zhconv-make.lua --- and the derived files zhconv-index.lua, zhconv-index.luc. +-- This work consists of the files ctex-zhconv.lua, ctex-zhconv-make.lua +-- and the derived file ctex-zhconv-index.lua. -- -------------------------------------------------------------------------- -- local preamble = [[ -- --- File zhconv-index.lua +-- File ctex-zhconv-index.lua -- -- Copyright (C) 2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- @@ -46,8 +46,8 @@ local preamble = [[ -- -- The Current Maintainer of this work is Qing Lee. -- --- This work consists of the files zhconv.lua, zhconv-make.lua --- and the derived files zhconv-index.lua, zhconv-index.luc. +-- This work consists of the files ctex-zhconv.lua, ctex-zhconv-make.lua +-- and the derived file ctex-zhconv-index.lua. -- -------------------------------------------------------------------------- -- @@ -109,6 +109,6 @@ insert(index, "}\n") local index = concat(index, "\n") -local handle = io_open("zhconv-index.lua", "wb") +local handle = io_open("ctex-zhconv-index.lua", "wb") handle:write(preamble:format(unpack(date)), index) handle:close() diff --git a/language/chinese/ctex/zhconv.lua b/language/chinese/ctex/ctex-zhconv.lua index 8af2161e26..d478c2e432 100644 --- a/language/chinese/ctex/zhconv.lua +++ b/language/chinese/ctex/ctex-zhconv.lua @@ -1,5 +1,5 @@ -- --- File zhconv.lua +-- File ctex-zhconv.lua -- -- Copyright (C) 2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- @@ -18,8 +18,8 @@ -- -- The Current Maintainer of this work is Qing Lee. -- --- This work consists of the files zhconv.lua, zhconv-make.lua --- and the derived files zhconv-index.lua. +-- This work consists of the files ctex-zhconv.lua, ctex-zhconv-make.lua +-- and the derived file ctex-zhconv-index.lua. -- -------------------------------------------------------------------------- -- @@ -28,12 +28,11 @@ if status.kpse_used ~= 1 then kpse.set_program_name("luatex") end -zhconv = zhconv or { } -local zhconv = zhconv +local zhconv = { } zhconv.module = { - name = "zhconv", - version = "0.1", - date = "2020/05/01", + name = "ctex-zhconv", + version = "0.2", + date = "2020/05/02", description = "GBK/GB18030/Big5 encoder", author = "Qing Lee", copyright = "Qing Lee", @@ -47,7 +46,7 @@ local floor = math.floor local unpack, insert, sort = table.unpack, table.insert, table.sort local char, format = string.char, string.format -zhconv.index = require("zhconv-index") +zhconv.index = require("ctex-zhconv-index") local index = zhconv.index zhconv.mapping = { } diff --git a/language/chinese/ctex/ctex.dtx b/language/chinese/ctex/ctex.dtx index bd92c7e0a0..f61198ac36 100644 --- a/language/chinese/ctex/ctex.dtx +++ b/language/chinese/ctex/ctex.dtx @@ -75,8 +75,8 @@ Copyright and Licence This package consists of the files ctex.dtx, ctxdoc.cls, ctxdocstrip.tex, - zhconv.lua, - zhconv-make.lua, + ctex-zhconv.lua, + ctex-zhconv-make.lua, and the derived files ctex.pdf, ctex.ins, ctex.sty, @@ -145,7 +145,7 @@ Copyright and Licence zhmacfonts.tex, zhubuntufonts.tex, zhwindowsfonts.tex, - zhconv-index.lua, + ctex-zhconv-index.lua, translator-theorem-dictionary-ChineseGBK.dict, translator-theorem-dictionary-ChineseUTF8.dict, and README.md (this file). @@ -187,8 +187,8 @@ Copyright and Licence This package consists of the files ctex.dtx, ctxdoc.cls, ctxdocstrip.tex, - zhconv.lua, - zhconv-make.lua, + ctex-zhconv.lua, + ctex-zhconv-make.lua, and the derived files ctex.pdf, ctex.ins, ctex.sty, @@ -257,7 +257,7 @@ Copyright and Licence zhmacfonts.tex, zhubuntufonts.tex, zhwindowsfonts.tex, - zhconv-index.lua, + ctex-zhconv-index.lua, translator-theorem-dictionary-ChineseGBK.dict, translator-theorem-dictionary-ChineseUTF8.dict, and README.md. @@ -443,7 +443,7 @@ Copyright and Licence %<class|style|ctexcap|ctexhook|ctexpatch>\NeedsTeXFormat{LaTeX2e} %<class>\input{ctexbackend.cfg} %<class|style|ctexcap|ctexhook|ctexpatch>\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: ctex.dtx d2534e9 2020-05-01 21:11:07 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+!driver>\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ %<ctex> {Chinese adapter in LaTeX (CTEX)} %<ctex>\ProvidesExplPackage{\ExplFileName} %<ctexsize> {Chinese font size definition (CTEX)} @@ -530,7 +530,7 @@ Copyright and Licence %<founder>\ProvidesExplFile{ctex-fontset-founder.def} %<ubuntu> {Ubuntu fonts definition (CTEX)} %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def} -%<!driver> {\ExplFileDate}{2.5}{\ExplFileDescription} +%<!driver> {\ExplFileDate}{2.5.1}{\ExplFileDescription} %</!(fd|ctexspa|dict|backend)> %<c19&rm>\ProvidesFile{c19rm.fd}% %<c19&sf>\ProvidesFile{c19sf.fd}% @@ -548,10 +548,10 @@ Copyright and Licence %<backend>\ProvidesFile{ctexbackend.cfg}% %<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% %<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% -%<fd> [2020/05/01 v2.5 Chinese font definition (CTEX)] -%<ctexspa> [2020/05/01 v2.5 Space info for CJKpunct (CTEX)] -%<backend> [2020/05/01 v2.5 Backend configuration file (CTEX)] -%<dict&theorem> [2020/05/01 v2.5 Chinese translation for theorem name (CTEX)] +%<fd> [2020/05/02 v2.5.1 Chinese font definition (CTEX)] +%<ctexspa> [2020/05/02 v2.5.1 Space info for CJKpunct (CTEX)] +%<backend> [2020/05/02 v2.5.1 Backend configuration file (CTEX)] +%<dict&theorem> [2020/05/02 v2.5.1 Chinese translation for theorem name (CTEX)] %</!(driver|readme|install|zhmap|spa|docstrip)> %<*driver> \documentclass{ctxdoc} @@ -573,6 +573,7 @@ Copyright and Licence % \changes{v2.4}{2015/02/19}{加强 \pkg{beamer} 宏包支持。} % \changes{v2.4.12}{2018/01/13}{同步 \LaTeXiii{} 2017/12/16。} % \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。} +% \changes{v2.5.1}{2020/05/02}{\pkg{zhconv} 更名为 \pkg{ctex-zhconv}。} % % \CheckSum{6105} % @@ -10600,17 +10601,17 @@ Copyright and Licence % 文件标识信息。 % \begin{macrocode} %<adobe>\ProvidesFile{zhadobefonts.tex}% -%<adobe> [2020/05/01 v2.5 Adobe font map loader for DVIPDFMx (CTEX)] +%<adobe> [2020/05/02 v2.5.1 Adobe font map loader for DVIPDFMx (CTEX)] %<fandol>\ProvidesFile{zhfandolfonts.tex}% -%<fandol> [2020/05/01 v2.5 Fandol font map loader for DVIPDFMx (CTEX)] +%<fandol> [2020/05/02 v2.5.1 Fandol font map loader for DVIPDFMx (CTEX)] %<founder>\ProvidesFile{zhfounderfonts.tex}% -%<founder> [2020/05/01 v2.5 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<founder> [2020/05/02 v2.5.1 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] %<mac>\ProvidesFile{zhmacfonts.tex}% -%<mac> [2020/05/01 v2.5 Mac font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<mac> [2020/05/02 v2.5.1 Mac font map loader for pdfTeX and DVIPDFMx (CTEX)] %<ubuntu>\ProvidesFile{zhubuntufonts.tex}% -%<ubuntu> [2020/05/01 v2.5 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<ubuntu> [2020/05/02 v2.5.1 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)] %<windows>\ProvidesFile{zhwindowsfonts.tex}% -%<windows> [2020/05/01 v2.5 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<windows> [2020/05/02 v2.5.1 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] % \end{macrocode} % % \paragraph{\pkg{zhadobefonts.tex}} diff --git a/language/chinese/ctex/ctex.pdf b/language/chinese/ctex/ctex.pdf Binary files differindex 7f13942d03..d17051b536 100644 --- a/language/chinese/ctex/ctex.pdf +++ b/language/chinese/ctex/ctex.pdf diff --git a/language/chinese/ctex/ctxdocstrip.tex b/language/chinese/ctex/ctxdocstrip.tex index 425496c0e5..e11443cb3b 100644 --- a/language/chinese/ctex/ctxdocstrip.tex +++ b/language/chinese/ctex/ctxdocstrip.tex @@ -76,14 +76,14 @@ } \def\ctxLuaFunc{% \directlua{ - local zhconv = require("zhconv").conv - local scan_string = token.scan_string + local zhconv = require("ctex-zhconv").conv + local scan_arg = token.scan_argument local t = lua.get_functions_table() local id = 233 while t[id] do id = id + 1 end t[id] = function () - local enc = scan_string() - local file = scan_string() + local enc = scan_arg() + local file = scan_arg() return zhconv(enc, file, file) end token.set_lua("ctxConv", id, "global", "protected") |