Skip to content

Commit

Permalink
ctex: 兼容 LuaTeX-ja(20200808.0)
Browse files Browse the repository at this point in the history
fixed #534
  • Loading branch information
qinglee committed Aug 16, 2020
1 parent 60cf6f7 commit e142a94
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions ctex/ctex.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ Copyright and Licence
% \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。}
% \changes{v2.5.1}{2020/05/02}{\pkg{zhconv} 更名为 \pkg{ctex-zhconv}。}
%
% \CheckSum{6223}
% \CheckSum{6227}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
Expand Down Expand Up @@ -4521,6 +4521,7 @@ Copyright and Licence
% \changes{v2.0}{2014/03/08}{通过 \pkg{LuaTeX-ja} 宏包支持 \LuaLaTeX。}
% \changes{v2.3}{2015/09/25}{更新 \pkg{LuaTeX-ja} 支持(20150922.0)。}
% \changes{v2.5}{2020/04/18}{更新 \pkg{LuaTeX-ja} 支持(20200412.0)。}
% \changes{v2.5.4}{2020/04/18}{更新 \pkg{LuaTeX-ja} 支持(20200808.0)。}
%
% \pkg{LuaTeX-ja} 为了兼容 p\LaTeX 的使用习惯,对 \LaTeXe 的 \pkg{NFSS} 作了不少
% 修改和扩充,这对于简体中文用户来说不是必要的。我们在这里禁用它。
Expand Down Expand Up @@ -4597,18 +4598,23 @@ Copyright and Licence
\directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
% \end{macrocode}
%
% 以下设置抄录自 \file{ltj-latex.sty}。
% 以下设置抄录自 2020/08/08 之前的 \file{ltj-latex.sty}。
% 自 2020/08/08 开始,\pkg{LuaTeX-ja} 引入新的缓存机制,此段设置被整合进 \file{luatexja.lua}。
% \begin{macrocode}
\directlua{
local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
}
\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
yalbaselineshift=\z@, yjabaselineshift=\z@,
jcharwidowpenalty=500, differentjfm=paverage
}
\@ifpackagelater{luatexja}{2020/08/08}
{}
{
\directlua{
local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
}
\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
yalbaselineshift=\z@, yjabaselineshift=\z@,
jcharwidowpenalty=500, differentjfm=paverage
}
}
% \end{macrocode}
%
% \begin{macrocode}
Expand Down

0 comments on commit e142a94

Please sign in to comment.