texlive[51963] Master/texmf-dist: luatexja (26aug19)
commits+karl at tug.org
commits+karl at tug.org
Mon Aug 26 23:07:07 CEST 2019
Revision: 51963
http://tug.org/svn/texlive?view=revision&revision=51963
Author: karl
Date: 2019-08-26 23:07:07 +0200 (Mon, 26 Aug 2019)
Log Message:
-----------
luatexja (26aug19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2019-08-26 21:07:07 UTC (rev 51963)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20190708.0
+The LuaTeX-ja Package 20190826.0
--------------------------------
Copyright (c) 2011--2019 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -23,7 +23,7 @@
0. Please make sure that your TeX distribution is up-to-date.
This version of LuaTeX-ja requires
- LuaTeX 1.0.0 or later
- - luaotfload v2.6
+ - luaotfload (v2.98 or later recommended)
- adobemapping (Adobe CMap files)
- everysel package
- etoolbox package
@@ -35,14 +35,14 @@
- IPAex fonts (http://ipafont.ipa.go.jp/)
Hence this version does not work in TeX Live 2016 (or earlier).
-1. If you are using TeX Live 2018 or later, you can install LuaTeX-ja via tlmgr.
+1. If you are using TeX Live 2019 or later, you can install LuaTeX-ja via tlmgr.
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20190708.0 in the Git repository by
+ or tagged as 20190826.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20190708.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20190826.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -87,4 +87,4 @@
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Mon Jul 8 15:23:01 2019 +0900
+Last commit date: Mon Aug 26 09:29:22 2019 +0900
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2019-08-26 21:07:07 UTC (rev 51963)
@@ -40,11 +40,12 @@
%%%%%%%% fonts
\usepackage{luatexja-otf}
\usepackage[no-math]{fontspec}
-\setmainfont[Ligatures=TeX]{Linux Libertine O}
+\setmainfont[Ligatures=TeX,RawFeature=-notdef]{Linux Libertine O}
\setmonofont[Scale=MatchLowercase, ItalicFont=lmmono10-italic.otf,
- BoldFont=lmmonolt10-bold.otf, BoldItalicFont=lmmonolt10-boldoblique.otf
+ BoldFont=lmmonolt10-bold.otf, BoldItalicFont=lmmonolt10-boldoblique.otf,
+ RawFeature=-notdef
]{lmmono10-regular.otf}
-\setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Linux Biolinum O}
+\setsansfont[Scale=MatchLowercase,Ligatures=TeX,RawFeature=-notdef]{Linux Biolinum O}
\usepackage[match]{luatexja-fontspec}
\usepackage[kozuka-pr6n]{luatexja-preset}
\usepackage{unicode-math}
@@ -650,11 +651,11 @@
%<ja>\LuaTeX-jaパッケージの動作には次のパッケージ類が必要である．
\begin{itemize}
\item \LuaTeX\ 1.0.0 (or later)
-\item \Pkg{luaotfload} v2.6 (or later)
+\item recent \Pkg{luaotfload} (v2.98 or later recommended)
\item \Pkg{adobemapping} (Adobe cmap and pdfmapping files)
\item \Pkg{etoolbox}, \Pkg{everysel} (if you want to use \LuaTeX-ja with \LaTeXe)
\item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{filehook}, \Pkg{atbegshi}
-\item \Pkg{fontspec} v2.5c (or later)
+\item \Pkg{fontspec} v2.7c (or later)
%<en>\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/})
%<ja>\item \emph{IPAexフォント(\url{http://ipafont.ipa.go.jp/})}
\end{itemize}
@@ -813,28 +814,28 @@
%</ja>
%<*en>
\item \LuaTeX-ja is very slower than \pTeX.
- Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja
- about 30\% faster than \LuaTeX, but not always%
- \footnote{%
- LuaJIT has several limitations such as 1\,GB~(or~2\,GB) memory limitation.
- So typesetting a large source by LuaJIT\TeX may cause an ``out of memory'' error,
- or failure of loading/saving font cache of \Pkg{luaotfload}.
- }.
+ % Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja
+ % about 30\% faster than \LuaTeX, but not always%
+ % \footnote{%
+ % LuaJIT has several limitations such as 1\,GB~(or~2\,GB) memory limitation.
+ % So typesetting a large source by LuaJIT\TeX may cause an ``out of memory'' error,
+ % or failure of loading/saving font cache of \Pkg{luaotfload}.
+ % }.
%</en>
%<*ja>
\item \LuaTeX-jaは動作が\pTeX に比べて非常に遅い．
コードを調整して徐々に速くしているが，まだ満足できる速度ではない．
-LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが，
-IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある
- \footnote{%
- LuaJITは1\,GB（あるいは2\,GB）のメモリ制限など，いくつかの制限事項があることが知られている．そのため，
- 大きいソースファイルをLuaJIT\TeX でタイプセットするとLuaの側で``out of memory''エラーが発生してしまう．
- 本ドキュメントのように，「各ページごとにLuaで使っているメモリ容量をチェックし，
- 必要なら\texttt{collectgarbage("collect")}でガベージコレクタを実行」すると
- 状況が多少改善されるかもしれない．
- また，LuaJIT\TeX でIPA mj明朝などの「大きい」フォントを利用した場合はフォントキャッシュの保存に失敗し，
- 毎回フォントを読み込まなければならず結果的に時間がかかることがある．
- }．
+% LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが，
+% IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある
+% \footnote{%
+% LuaJITは1\,GB（あるいは2\,GB）のメモリ制限など，いくつかの制限事項があることが知られている．そのため，
+% 大きいソースファイルをLuaJIT\TeX でタイプセットするとLuaの側で``out of memory''エラーが発生してしまう．
+% 本ドキュメントのように，「各ページごとにLuaで使っているメモリ容量をチェックし，
+% 必要なら\texttt{collectgarbage("collect")}でガベージコレクタを実行」すると
+% 状況が多少改善されるかもしれない．
+% また，LuaJIT\TeX でIPA mj明朝などの「大きい」フォントを利用した場合はフォントキャッシュの保存に失敗し，
+% 毎回フォントを読み込まなければならず結果的に時間がかかることがある．
+% }．
%</ja>
\item%
@@ -3856,7 +3857,7 @@
\item[\cs{ltj at stdyokojfm}]
%<en>The default JFM for horizontal direction.
%<ja>標準で用いる横組用JFM．
- \item[\cs{ltj at stdyokojfm}]
+ \item[\cs{ltj at stdtatejfm}]
%<en>The default JFM for vertical direction.
%<ja>標準で用いる縦組用JFM．
\end{cslist}
@@ -4692,7 +4693,7 @@
%<ja>\paragraph{仮想的な文字}
%<en>\paragraph{Imaginary characters}
%<*en>
-As described before, you can specify several \emph{imaginary characters} in
+As described before, you can specify several ``imaginary characters'' in
\texttt{chars} field. The most of these characters are regarded as the
characters of class 0 in \pTeX.
As a result, \LuaTeX-ja can control typesetting finer than \pTeX.
@@ -4711,8 +4712,17 @@
%%<ja>JFMやサイズが異なる2つの\textbf{JAchar}の間の境界として用いられる．
\item['boxbdd']
-%<en>The beginning/ending of a hbox, and the beginning of a noindented (i.e., began by \cs{noindent}) paragraph.
-%<ja>hboxの先頭と末尾，及びインデントされていない（\cs{noindent} で開始された）段落の先頭を表す．
+%<*en>
+The beginning/ending of a hbox, and the beginning of a noindented (i.e., began by \cs{noindent}) paragraph.
+If a hbox~$b$ begins (resp.~ends) a glue or kern between this ``charater'' and a \textbf{JAchar},
+\textbf{JAglue} won't be inserted before(resp.~after) the hbox~$b$.
+\Param{kanjiskip}~and~\Param{xkanjiskip} around a hbox.
+%</en>
+%<*ja>
+hboxの先頭と末尾，及びインデントされていない（\cs{noindent} で開始された）段落の先頭を表す．
+この「文字」との間に設定したグルー・カーンがボックス$b$の先頭（もしくは末尾）に来た場合，
+ そのボックス$b$の直前（もしくは直後）には和文処理グルーは入らない．
+%</ja>
\item['parbdd']
%<en>The beginning of an (indented) paragraph.
@@ -7260,7 +7270,7 @@
\begin{description}
\item[\texttt{lineend=[false,true,extended]}]
行末文字の位置調整の機能を無効化(\texttt{false})，「行分割後に調整」の形で有効化(\texttt{true})，
- 「行分割の仮定で考慮」の形で有効化(\texttt{extended})する．
+ 「行分割の過程で考慮」の形で有効化(\texttt{extended})する．
\item[\texttt{priority=[false,true]}]
優先順位付きの行長調整を無効化(\texttt{false})，または有効化(\texttt{true})．
\item[\texttt{profile=[false,true]}]
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2019-08-26 21:07:07 UTC (rev 51963)
@@ -120,6 +120,7 @@
% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
% (sync with ltsect.dtx 2018/09/26 v1.1c)}
% \changes{v1.8b}{2019/04/02}{新元号対応}
+% \changes{v1.8b-ltj-17}{2019/08/12}{disablejfamの``Unused global option(s)''警告を出さないようにした}
% \fi
%
@@ -150,7 +151,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -605,6 +606,18 @@
%</article|report|book>
% \end{macrocode}
%
+% \subsection{disablejfamオプション}
+% \changes{v1.8b-ltj-17}{2019/08/12}{disablejfamの``Unused global option(s)''警告を出さないようにした}
+% disablejfamオプションはLua\TeX-ja本体で処理しますが，
+% もうLua\TeX-jaは読み込んでいるため，このままでは``Unused global option(s): [disablejfam]''警告が
+% 出てしまいます．そのため，「何もしない」disablejfamオプションをクラス内で定義しておきます．
+%
+% \begin{macrocode}
+%<*article|report|book>
+\DeclareOption{disablejfam}{}
+%</article|report|book>
+% \end{macrocode}
+%
% \subsection{オプションの実行}
% オプションの実行、およびサイズクラスのロードを行ないます。
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2019-08-26 21:07:07 UTC (rev 51963)
@@ -44,7 +44,7 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2019/04/06 ltjsclasses ]
+ [2019/08/12 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass[disablejfam]{ltjsarticle}
@@ -600,6 +600,14 @@
% [2018-10-08 LTJ] Lua\TeX-ja本体が\texttt{disablejfam}オプションをサポートしたので，
% クラスファイルからは削除します．
%
+% [2019-08-12 LTJ] ……と思いましたが，``Unused global option(s): [disablejfam]''警告が
+% 出てしまいますので，「何もしない」クラスオプションとして形だけ定義します．
+% \begin{macrocode}
+%<*article|report|book>
+\DeclareOption{disablejfam}{}
+%</article|report|book>
+% \end{macrocode}
+%
% \paragraph{ドラフト}
%
% \texttt{draft} でoverfull boxの起きた行末に5ptの罫線を引きます。
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luatexja-fontspec-25c}[2019/05/14 fontspec support of LuaTeX-ja]
-\RequirePackage{l3keys2e,luatexja}
+\RequirePackage{l3keys2e}
\ExplSyntaxOn
%%%%%%%% Change Japanese font family by \rmfamily or not
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luatexja-fontspec-26h}[2019/05/14 fontspec support of LuaTeX-ja]
-\RequirePackage{l3keys2e,luatexja}
+\RequirePackage{l3keys2e}
\ExplSyntaxOn
%%%%%%%% Change Japanese font family by \rmfamily or not
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luatexja-fontspec-27c}[2019/05/14 fontspec support of LuaTeX-ja]
-\RequirePackage{l3keys2e,luatexja}
+\RequirePackage{l3keys2e}
\ExplSyntaxOn
%%%%%%%% Change Japanese font family by \rmfamily or not
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2019-08-26 21:07:07 UTC (rev 51963)
@@ -297,7 +297,6 @@
t[200]=table.fastcopy(t[0])
t[200].chars={'〱', '〲'}
t[200].width = 2.0
-t[200].left=-0.5
for i,v in pairs(t) do
if type(v)=='table' then
if v.glue and v.glue[0] then v.glue[200] = v.glue[0] end
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua 2019-08-26 21:07:07 UTC (rev 51963)
@@ -257,7 +257,7 @@
if lfs.isdir(testpath) then savepath = testpath; break end
end
- save_cache_luc = function (filename, t, serialized)
+ local function save_cache_luc(filename, t, serialized)
local fullpath = savepath .. '/' .. filename .. luc_suffix
local s = serialized or serialize(t, 'return', false)
if s then
@@ -271,7 +271,7 @@
end
end
- save_cache = function (filename, t)
+ local function save_cache(filename, t)
local fullpath = savepath .. '/' .. filename .. '.lua'
local s = serialize(t, 'return', false)
if s then
@@ -285,7 +285,7 @@
end
end
- local function load_cache_a (filename, outdate)
+ local function load_cache_a(filename, outdate)
local result
for _,v in pairs(path) do
local fn = join(v, cache_dir, filename)
@@ -302,7 +302,7 @@
end
end
- load_cache = function (filename, outdate)
+ local function load_cache(filename, outdate)
local r = load_cache_a(filename .. luc_suffix, outdate)
if r then
return r
@@ -313,6 +313,17 @@
end
end
+ local function remove_file_if_exist(name)
+ if os.rename(name,name) then os.remove(name) end
+ end
+ local function remove_cache (filename)
+ local fullpath_wo_ext = savepath .. '/' .. filename .. '.lu'
+ remove_file_if_exist(fullpath_wo_ext .. 'a')
+ remove_file_if_exist(fullpath_wo_ext .. 'b')
+ remove_file_if_exist(fullpath_wo_ext .. 'c')
+ end
+
+ ltjb.remove_cache = remove_cache
ltjb.load_cache = load_cache
ltjb.save_cache_luc = save_cache_luc
ltjb.save_cache = save_cache
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2019-08-26 21:07:07 UTC (rev 51963)
@@ -3,7 +3,7 @@
--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2018/08/11',
+ date = '2019/07/26',
description = 'Insertion process of JFM glues, [x]kanjiskip and others',
})
luatexja.jfmglue = luatexja.jfmglue or {}
@@ -267,7 +267,7 @@
-- calc next Np
local calc_np
-do
+do -- 001 -----------------------------------------------
local traverse = node.direct.traverse
local function check_next_ickern(lp)
@@ -306,21 +306,40 @@
return lp
end
-local ltjw_apply_ashift_math = ltjw.apply_ashift_math
-local ltjw_apply_ashift_disc = ltjw.apply_ashift_disc
-local min, max = math.min, math.max
-local function calc_np_aux_glyph_common(lp, acc_flag)
- Np.nuc = lp
- Np.first= (Np.first or lp)
- if if_lang_ja(lp) then
+local calc_np_aux_glyph_common
+do -- 002 ---------------------------------------
+ local min, max = math.min, math.max
+ local getwhd = node.direct.getwhd
+ local attr_jchar_class = luatexbase.attributes['ltj at charclass']
+ local attr_jchar_code = luatexbase.attributes['ltj at charcode']
+ local identifiers = fonts.hashes.identifiers
+ local function calc_np_notdef(lp)
+ local ident = identifiers[getfont(lp)]
+ if not ident.descriptions[getchar(lp)] then
+ local ln = node_next(lp)
+ if (ident.shared and ident.shared.features and ident.shared.features.notdef)
+ and ln and getid(ln)==id_glyph then
+ set_attr(lp, attr_icflag, PROCESSED)
+ set_attr(ln, attr_jchar_code, has_attr(lp, attr_jchar_code) or getchar(lp))
+ set_attr(ln, attr_jchar_class, has_attr(lp, attr_jchar_class) or 0)
+ Np.nuc, lp = ln, ln
+ end
+ end
+ return lp
+ end
+function calc_np_aux_glyph_common(lp, acc_flag)
+ Np.nuc, Np.first = lp, (Np.first or lp)
+ if if_lang_ja(lp) then -- JAchar
Np.id = id_jglyph
local m, mc, cls = set_np_xspc_jachar(Np, lp)
local npi, npf
+ local w, h, d = getwhd(lp)
+ if w==0 and h==0 and d==0 then lp = calc_np_notdef(lp) end
lp, head, npi, npf = capsule_glyph(lp, m, mc[cls], head, tex_dir)
Np.first = (Np.first~=Np.nuc) and Np.first or npf or npi
Np.nuc = npi
return true, check_next_ickern(lp);
- else
+ else --ALchar
Np.id = id_glyph
set_np_xspc_alchar(Np, getchar(lp), lp, 1)
-- loop
@@ -403,8 +422,11 @@
return true, lp
end
end
+end -- 002 ---------------------------------------
local calc_np_auxtable
-do
+do -- 002 ---------------------------------------
+local ltjw_apply_ashift_math = ltjw.apply_ashift_math
+local ltjw_apply_ashift_disc = ltjw.apply_ashift_disc
local node_end_of_math = node.direct.end_of_math
local dir_tate = luatexja.dir_table.dir_tate
local sid_start_link = node.subtype('pdf_start_link')
@@ -445,6 +467,10 @@
local lq = node_next(lp);
head = node_remove(head, lp); node_free(lp); non_ihb_flag = false
return false, lq;
+ elseif getfield(lp, 'user_id')==luatexja.userid_table.JA_AL_BDD then
+ local lq = node_next(lp);
+ head = node_remove(head, lp); node_free(lp)
+ return false, lq;
else
set_attr(lp, attr_icflag, PROCESSED)
luatexbase.call_callback("luatexja.jfmglue.whatsit_getinfo",
@@ -513,7 +539,7 @@
return false, node_next(lp)
end,
}
-end
+end -- 002 ---------------------------------------
calc_np_auxtable[id_rule] = calc_np_auxtable.box_like
calc_np_auxtable[15] = calc_np_auxtable.box_like
@@ -551,7 +577,7 @@
end
Np=nil
end
-end
+end -- 001 -----------------------------------------------
-- extract informations from Np
-- We think that "Np is a Japanese character" if Np.met~=nil,
@@ -1255,7 +1281,7 @@
end
do
- local IHB = luatexja.userid_table.IHB
+ local IHB = luatexja.userid_table.IHB
local BPAR = luatexja.userid_table.BPAR
local BOXB = luatexja.userid_table.BOXB
local node_prev = node.direct.getprev
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2019-08-26 21:07:07 UTC (rev 51963)
@@ -809,11 +809,18 @@
do
local sort = table.sort
prepare_fl_data = function (dest, id)
- local t = {}
+ local ascent = id.shared.rawdata.metadata.ascender
+ local t_vorigin, t_ind_to_uni = {}, {}
for i,v in pairs(id.shared.rawdata.descriptions) do
- t[v.index] = i
+ t_ind_to_uni[v.index] = i
+ if v.tsb then
+ local j = v.boundingbox[4] + v.tsb
+ if j~=ascent then t_vorigin[i]=j end
+ end
end
- dest = dest or {}; dest.ind_to_uni = t
+ dest = dest or {}
+ dest.ind_to_uni = t_ind_to_uni
+ dest.vorigin = t_vorigin
return dest
end
end
@@ -820,35 +827,14 @@
--
do
- local cache_ver = 18
-
local function prepare_extra_data_base(id)
if (not id) or (not id.filename) then return end
local bname = id.psname or file.nameonly(id.filename)
if not font_extra_basename[bname] then
- -- if the cache is present, read it
- if not lfs then lfs=require"lfs" end
- local newtime = lfs.attributes(id.filename,"modification")
- local v = "extra_" .. string.lower(bname)
- local dat = ltjb.load_cache(
- v,
- function (t) return (t.version~=cache_ver) or (t.modtime~=newtime) end
- )
- -- if the cache is not found or outdated, save the cache
- if dat then
- font_extra_basename[bname] = dat[1] or {}
- else
- local dat = nil
- dat = prepare_fl_data(dat, id)
- dat = list_rotate_glyphs(dat, id)
- font_extra_basename[bname] = dat or {}
- ltjb.save_cache( v,
- {
- modtime = newtime,
- version = cache_ver,
- dat,
- })
- end
+ ltjb.remove_cache("extra_" .. string.lower(bname)) -- remove cache
+ local dat = prepare_fl_data(dat, id)
+ dat = list_rotate_glyphs(dat, id)
+ font_extra_basename[bname] = dat or {}
return bname
end
end
@@ -883,64 +869,7 @@
end
end
-
------------------------------------------------------------------------
--- calculate vadvance
-------------------------------------------------------------------------
-do
- local function acc_feature(table_vadv, table_vorg, subtables, ft, already_vert)
- for char_num,v in pairs(ft.shared.rawdata.descriptions) do
- if v.slookups then
- for sn, sv in pairs(v.slookups) do
- if subtables[sn] and type(sv)=='table' then
- if sv[4]~=0 then
- table_vadv[char_num]
- = (table_vadv[char_num] or 0) + sv[4]
- end
- if sv[2]~=0 and not already_vert then
- table_vorg[char_num]
- = (table_vorg[char_num] or 0) + sv[2]
- end
- end
- end
- end
- end
- end
-
-luatexbase.add_to_callback(
- "luatexja.define_jfont",
- function (fmtable, fnum)
- local vadv = {}; fmtable.v_advance = vadv
- local vorg = {}; fmtable.v_origin = vorg
- local ft = font_getfont(fnum)
- local subtables = {}
- if ft.specification then
- for feat_name,v in pairs(ft.specification.features.normal) do
- if v==true and ft.resources then
- for _,i in pairs(ft.resources.sequences) do
- if i.order[1]== feat_name and i.type == 'gpos_single' and type(i.subtables)=='table' then
- for _,st in pairs(i.subtables) do
- subtables[st] = true
- end
- end
- end
- end
- end
- acc_feature(vadv, vorg, subtables, ft,
- ft.specification.features.normal.vrt2 or ft.specification.features.normal.vert)
- for i,v in pairs(vadv) do
- vadv[i]=vadv[i]/ft.units_per_em*fmtable.size
- end
- for i,v in pairs(vorg) do
- vorg[i]=vorg[i]/ft.units_per_em*fmtable.size
- end
- end
- return fmtable
- end, 'ltj.v_advance', 1
-)
-end
-
-------------------------------------------------------------------------
-- make table of vertical glyphs which does not covered by vert feature
-- nor UTR#50
------------------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua 2019-08-26 21:07:07 UTC (rev 51963)
@@ -43,9 +43,9 @@
local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
local ltjs_orig_char_table = ltjs.orig_char_table
local ltjf_replace_altfont = ltjf.replace_altfont
-local attr_orig_char = luatexbase.attributes['ltj at origchar']
local STCK = luatexja.userid_table.STCK
local DIR = luatexja.userid_table.DIR
+local JA_AL_BDD = luatexja.userid_table.JA_AL_BDD
local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
local dir_tate = luatexja.dir_table.dir_tate
@@ -86,6 +86,9 @@
{
__index = function() return node_next end,
})
+ local id_boundary = node.id('boundary')
+ local node_new, insert_before = node.direct.new, node.direct.insert_before
+ local setsubtype = node.direct.setsubtype or function(n,l) setfield(n,'subtype',l) end
local function suppress_hyphenate_ja (h)
start_time_measure('ltj_hyphenate')
head = to_direct(h)
@@ -98,15 +101,26 @@
do
local p = head
while p do
- local pid = getid(p)
+ local pid, prev_chartype = getid(p), 0
+ -- prev_chartype: 0: not char 1: ALchar 2: JAchar
while pid==id_glyph do
local pc = getchar(p)
if has_attr(p, attr_icflag, 0) and is_ucs_in_japanese_char(p, pc) then
+ if prev_chartype==1 then
+ local b = node_new(id_whatsit,sid_user);
+ setfield(b, 'type', 100); setfield(b, 'user_id', JA_AL_BDD);
+ insert_before(head, p, b)
+ end
local pf = has_attr(p, attr_curjfnt)
pf = (pf and pf>0 and pf) or getfont(p)
setfont(p, ltjf_replace_altfont(pf, pc))
setlang(p, lang_ja)
- ltjs_orig_char_table[p] = pc
+ ltjs_orig_char_table[p], prev_chartype = pc, 2
+ elseif prev_chartype==2 then
+ local b = node_new(id_whatsit,sid_user);
+ setfield(b, 'type', 100); setfield(b, 'user_id', JA_AL_BDD);
+ insert_before(head, p, b); prev_chartype = 1
+ else prev_chartype = 1
end
p = node_next(p); pid = getid(p)
end
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2019-08-26 21:07:07 UTC (rev 51963)
@@ -14,6 +14,7 @@
local getlist = node.direct.getlist
local getchar = node.direct.getchar
local getsubtype = node.direct.getsubtype
+local getwidth = node.direct.getwidth or function(n) return getfield(n,'width') end
local getdepth = node.direct.getdepth or function(n) return getfield(n,'depth') end
local getwhd = node.direct.getwhd or function(n)
return getfield(n,'width'), getfield(n,'height'),getfield(n,'depth') end
@@ -23,6 +24,7 @@
local setchar = node.direct.setchar or function(n,c) setfield(n,'char',c) end
local setnext = node.direct.setnext or function(n,c) setfield(n,'next',c) end
local setdir = node.direct.setdir or function(n,c) setfield(n,'dir',c) end
+local setkern = node.direct.setkern or function(n,c) setfield(n,'kern',c) end
local setoffsets = node.direct.setoffsets or function(n,x,y)
setfield(n,'xoffset',x); setfield(n,'yoffset',y) end
local getoffsets = node.direct.getoffsets or function(n)
@@ -56,6 +58,7 @@
local attr_ykblshift = luatexbase.attributes['ltj at ykblshift']
local attr_tkblshift = luatexbase.attributes['ltj at tkblshift']
local attr_icflag = luatexbase.attributes['ltj at icflag']
+local attr_vert_ori = luatexbase.attributes['ltj at vert@ori']
local ltjf_font_extra_info = ltjf.font_extra_info
@@ -81,7 +84,7 @@
end)
local call_callback = luatexbase.call_callback
-local fshift = { down = 0, left = 0}
+local fshift = { down = 0, left = 0 }
local min, max = math.min, math.max
@@ -175,21 +178,19 @@
local ascent, descent = met.ascent, met.descent
local fwidth, pwidth = char_data.width
do
- local pf = getfont(p)
- local pc = getchar(p)
+ local pf, pc = getfont(p), getchar(p)
local feir = ltjf_font_extra_info[pf]
if feir and feir.rotation and met.vert_activated then
- if feir.rotation[pc] then
+ if feir.rotation[pc] and (has_attr(p, attr_vert_ori) or 0)<=0 then
return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(ascent-descent))
end
end
local ident = fonts.hashes.identifiers[pf]
- pwidth = (ident.descriptions and ident.descriptions[pc]
+ pwidth = (ident.descriptions and ident.descriptions[pc]
and ident.descriptions[pc].vheight
and ident.descriptions[pc].vheight / ident.units * met.size)
- or (ascent+descent)
- pwidth = pwidth + (met.v_advance[pc] or 0)
- ascent = met.v_origin[pc] and ascent - met.v_origin[pc] or ascent
+ or (ident.metadata and ident.metadata.defaultvheight) or (ascent+descent)
+ ascent = feir.vorigin[pc] and (feir.vorigin[pc] / ident.units * met.size) or ascent
end
fwidth = fwidth or pwidth
fshift.down = char_data.down; fshift.left = char_data.left
@@ -210,9 +211,9 @@
local ws = node_new(id_whatsit, sid_save)
local wm = node_new(id_whatsit, sid_matrix)
setfield(wm, 'data', '0 1 -1 0')
- local pwnh = -round(0.5*getfield(p, 'width'))
- local k2 = node_new(id_kern, 1); setfield(k2, 'kern', pwnh)
- local k3 = node_new(id_kern, 1); setfield(k3, 'kern', -getfield(p, 'width')-pwnh)
+ local pwnh = -round(0.5*getwidth(p))
+ local k2 = node_new(id_kern, 1); setkern(k2, pwnh)
+ local k3 = node_new(id_kern, 1); setkern(k3, -getwidth(p)-pwnh)
local wr = node_new(id_whatsit, sid_restore)
setfield(box, 'head', ws)
setnext(ws, wm); setnext(wm, k2);
@@ -228,7 +229,7 @@
local function capsule_glyph_math(p, met, char_data)
if not char_data then return nil end
- local fwidth, pwidth = char_data.width, getfield(p, 'width')
+ local fwidth, pwidth = char_data.width, getwidth(p)
fwidth = fwidth or pwidth
fshift.down = char_data.down; fshift.left = char_data.left
fshift = call_callback("luatexja.set_width", fshift, met, char_data)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -136,6 +136,7 @@
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj at stdgtfont:jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+\DeclareOption{disablejfam}{}
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
\ProcessOptions\relax
\input{ltjsize1\@ptsize.clo}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -146,6 +146,7 @@
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj at stdgtfont:jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+\DeclareOption{disablejfam}{}
\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright}
\ProcessOptions\relax
\input{ltjbk1\@ptsize.clo}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -144,6 +144,7 @@
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj at stdgtfont:jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+\DeclareOption{disablejfam}{}
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
\ProcessOptions\relax
\input{ltjsize1\@ptsize.clo}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2019/04/06 ltjsclasses ]
+ [2019/08/12 ltjsclasses ]
\def\jsc at clsname{ltjsarticle}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
@@ -194,6 +194,7 @@
&\global\@eqcnt\thr@@ \hb at xt@\z@\bgroup\hss##\egroup
\tabskip\z at skip\cr
}}
+\DeclareOption{disablejfam}{}
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
\newif\ifmingoth
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2019/04/06 ltjsclasses ]
+ [2019/08/12 ltjsclasses ]
\def\jsc at clsname{ltjsbook}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
@@ -199,6 +199,7 @@
&\global\@eqcnt\thr@@ \hb at xt@\z@\bgroup\hss##\egroup
\tabskip\z at skip\cr
}}
+\DeclareOption{disablejfam}{}
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
\newif\ifmingoth
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2019/04/06 ltjsclasses ]
+ [2019/08/12 ltjsclasses ]
\def\jsc at clsname{ltjskiyou}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2019/04/06 ltjsclasses ]
+ [2019/08/12 ltjsclasses ]
\def\jsc at clsname{ltjspf}
\def\Cjascale{0.903375}
\RequirePackage{luatexja}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2019/04/06 ltjsclasses ]
+ [2019/08/12 ltjsclasses ]
\def\jsc at clsname{ltjsreport}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
@@ -198,6 +198,7 @@
&\global\@eqcnt\thr@@ \hb at xt@\z@\bgroup\hss##\egroup
\tabskip\z at skip\cr
}}
+\DeclareOption{disablejfam}{}
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
\newif\ifmingoth
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -147,6 +147,7 @@
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj at stdgtfont:jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+\DeclareOption{disablejfam}{}
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,tate}
\ProcessOptions\relax
\input{ltjtsize1\@ptsize.clo}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -157,6 +157,7 @@
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj at stdgtfont:jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+\DeclareOption{disablejfam}{}
\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright,tate}
\ProcessOptions\relax
\input{ltjtbk1\@ptsize.clo}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -155,6 +155,7 @@
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj at stdgtfont:jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+\DeclareOption{disablejfam}{}
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany,tate}
\ProcessOptions\relax
\input{ltjtsize1\@ptsize.clo}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2019-08-26 21:07:07 UTC (rev 51963)
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2019/04/06 v1.8b-ltj-16
+ [2019/08/12 v1.8b-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -137,7 +137,6 @@
\newattribute\ltj at icflag % attribute for italic correction
\newattribute\ltj at curjfnt % index for ``current horizontal Japanese font''
\newattribute\ltj at curtfnt % index for ``current vertical Japanese font''
-\newattribute\ltj at origchar %
\newattribute\ltj at charclass %
\newattribute\ltj at charcode %
\newattribute\ltj at autospc % attribute for autospacing
@@ -147,12 +146,12 @@
\newattribute\ltj at tablshift % attribute for talbaselineshift
\newattribute\ltj at tkblshift % attribute for tjabaselineshift
\newattribute\jfam % index for current jfam
+\newattribute\ltj at vert@ori % <=0: UAX#50, >0: always upright
\newattribute\ltj at dir
\newlanguage\ltj@@japanese
\ltj at dir\z@
\ltj at icflag\z@
-\ltj at origchar\z@
\ltj at charclass\z@
\ltj at curjfnt\m at ne
\ltj at curtfnt\m at ne
@@ -477,14 +476,20 @@
%%%%%%%% \ltjalchar<number>, \ltjjachar<number>
\let\ltj@@origchar=\char
-\protected\def\ltj at alljachar{\relax
- \csname ltj at kcat0\endcsname\z@
- \csname ltj at kcat1\endcsname\z@
- \csname ltj at kcat2\endcsname\z@
- \csname ltj at kcat3\endcsname\z@
- \csname ltj at kcat4\endcsname\z@
- \csname ltj at kcat5\endcsname\z@
- \csname ltj at kcat6\endcsname\z@}
+\newluafunction\ltj at alljachar@inner
+\directlua{
+ local t, set_attr = lua.get_functions_table(), tex.setattribute
+ local get_attr, floor = tex.getattribute, math.floor
+ local attr_curjfnt = luatexbase.attributes['ltj at curjfnt']
+ local lang_ja = luatexja.lang_ja
+ t[\the\ltj at alljachar@inner] = function()
+ font.current(get_attr(attr_curjfnt)); tex.language=lang_ja;
+ for i=0,6 do
+ set_attr(luatexbase.attributes['ltj at kcat' .. floor(i)],0)
+ end
+ end
+}
+\protected\def\ltj at alljachar{\luafunction\ltj at alljachar@inner}
\protected\def\ltj at allalchar{\relax
\csname ltj at kcat0\endcsname="7FFFFFFF %"
\csname ltj at kcat1\endcsname="7FFFFFFF %"
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2019-08-26 21:07:07 UTC (rev 51963)
@@ -80,6 +80,7 @@
userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」
userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向
userid_table.BOXB = luatexbase.newuserwhatsitid('box_boundary', 'luatexja') -- 「ボックス始め・終わり」
+userid_table.JA_AL_BDD = luatexbase.newuserwhatsitid('ja_al_boundary', 'luatexja')
local dir_table = {}
luatexja.dir_table = dir_table
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -41,7 +41,7 @@
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20190708.0}
+\def\LuaTeXjaversion{20190827.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
@@ -48,8 +48,7 @@
%% Load all sub-packages.
\ifltj at in@latex %<*LaTeX>
%% \RequirePackage{expl3} needed if the version of l3kernel is v6111
- \RequirePackage{luatexja-core}
- \RequirePackage{luatexja-compat}
+ \RequirePackage{luatexja-core,luatexja-compat}
\else %<*!LaTeX>
\input luatexja-core.sty %
\input luatexja-compat.sty %
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2019/05/01 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2019/08/21 Default font settings of LuaTeX-ja]
\ifdefined\ltj at stdmcfont\else\def\ltj at stdmcfont{IPAExMincho}\fi
\ifdefined\ltj at stdgtfont\else\def\ltj at stdgtfont{IPAExGothic}\fi
@@ -17,6 +17,10 @@
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY3}{}{}
\DeclareKanjiSubstitution{JY3}{mc}{m}{n}
\DeclareTateKanjiEncoding{JT3}{}{}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2019/01/29 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2019/08/21 Patch to NFSS2 for LuaTeX-ja]
\def\ltj at chardef@text at cmd#1{%
\let\@ifdefinable\@@ifdefinable%
@@ -228,6 +228,7 @@
\def\default at series{#3}%
\def\default at shape{#4}}%
\fi}
+\@onlypreamble\DeclareKanjiSubstitution
\def\DeclareErrorKanjiFont#1#2#3#4#5{%
\xdef\error at kfontshape{%
\noexpand\expandafter\noexpand\split at name\noexpand\string
@@ -236,12 +237,7 @@
\gdef\default at k@family{#2}%
\gdef\default at k@series{#3}%
\gdef\default at k@shape{#4}%
- \global\let\k at family\default at k@family
- \global\let\k at series\default at k@series
- \global\let\k at shape\default at k@shape
- \gdef\f at size{#5}%
- \gdef\f at baselineskip{#5pt}}
-\@onlypreamble\DeclareKanjiSubstitution
+ }
\@onlypreamble\DeclareErrorKanjiFont
\newif\ifltjselectfont at force@define
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -5,7 +5,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{lltjp-array}[2018/03/29 Patch to array for LuaTeX-ja]
-\RequirePackage{etoolbox,array,luatexja}
+\RequirePackage{etoolbox,array}
\patchcmd\insert at column{%
\ignorespaces\@sharp\unskip
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{fontspec,luatexja}
+\RequirePackage{fontspec}
\ExplSyntaxOn
% <= v2.6g uses \l__fontspec_nfss_enc_tl instead of \g__fontspec_nfss_enc_tl
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -1,5 +1,5 @@
%
-% lltjp-microtype.sty 2019-03-29
+% lltjp-microtype.sty 2019-08-12
%
% (Work in Progress)
%
@@ -6,17 +6,28 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{etoolbox}
-\RequirePackage{luatexja}
\makeatletter
\def\MT at register@font{%
- \xdef\MT at font@list{\expandonce{\MT at font@list}\MT at font,}%
+ \xdef\MT at font@list{\expandonce{\MT at font@list\MT at font},}% !!!
}
\def\MT at register@subst at font{\MT at exp@one at n\MT at in@clist\font at name\MT at font@list
\ifMT at inlist@\else
- \xdef\MT at font@list{\expandonce{\MT at font@list}\font at name,}%
+ \xdef\MT at font@list{\expandonce{\MT at font@list\font at name},}% !!!
\fi}
+\let\ltj at MT@tracking@\MT at tracking@
+\def\MT at tracking@{%
+ \MT at exp@one at n\MT at in@clist\MT at font\MT at tr@font at list
+ \ifMT at inlist@\else
+ \MT at maybe@do{tr}%
+ \ifMT at do\else
+ \xdef\MT at tr@font at list{\expandonce{\MT at tr@font at list\MT at font,}}% !!!
+ \fi
+ \fi
+}
+\ifx\MT at tracking\ltj at MT@tracking@\let\MT at tracking\MT at tracking@\fi
+
%\endinput
\begingroup
\catcode`\/=\z@
@@ -23,10 +34,11 @@
/MT at map@tlist at n{/\LτJCHAREX}/@makeother /lccode`/τ=`/t
/lowercase{%
/def/x{/endgroup
+ /def/MT at charstring{\CHAR"}%
/def/MT at is@char##1\CHAR"##2##3##4/relax{%
%/message{MIC <##1><##2><##3><##4>}%
/ifx/relax##4/relax
- /expandafter/MT at is@char at ltja/MT at strip@prefix##1/relax\LτJALCHAR\LτJALCHAR/relax
+ /expandafter/MT at is@char at ltja/MT at strip@prefix##1>/relax\LτJALCHAR\LτJALCHAR/relax
/else
/ifx/relax##1/relax
/if##3\/relax
@@ -40,10 +52,12 @@
/fi
/fi
}%
+ /def/MT at ltjs@drop@##1>##2/relax{##1}%
/def/MT at is@char at ltja##1\LτJALCHAR##2\LτJALCHAR##3/relax{%
+ %/typeout{MICLTJA <##1><##2><##3>}%
/ifx/relax##1/relax
/ifx/relax##2/relax/else
- /edef/MT at char@{/number##2}%
+ /edef/MT at char@{/expandafter/number/MT at ltjs@drop@##2>/relax}%
/fi
/fi
}%
@@ -50,5 +64,4 @@
}%
}
/x
-
\endinput
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -5,7 +5,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{lltjp-preview}[2018/01/20 Patch to preview for LuaTeX-ja]
-\RequirePackage{etoolbox,preview,luatexja}
+\RequirePackage{etoolbox,preview}
\newbox\ltj at preview@box
\patchcmd\pr at endbox{%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{luatexja}
+\RequirePackage{siunitx}
\makeatletter
\ExplSyntaxOn
\cs_generate_variant:Nn \tl_if_in:NnT { coT }
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{stfloats,luatexja}
+\RequirePackage{stfloats}
\RequirePackage{etoolbox}
\newif\ifltj at stfloats@fnbelowfloat
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -9,7 +9,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{lltjp-tascmac}[2017/12/23 Patch to (t)ascmac for LuaTeX-ja]
-\RequirePackage{tascmac,luatexja}
+\RequirePackage{tascmac}
%% use Type1 font for ascgrp
\pdfextension mapline{+ascgrp <ascgrp.pfb}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{unicode-math,luatexja,etoolbox}
+\RequirePackage{unicode-math,etoolbox}
\ExplSyntaxOn
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty 2019-08-26 21:05:47 UTC (rev 51962)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty 2019-08-26 21:07:07 UTC (rev 51963)
@@ -6,7 +6,7 @@
\ProvidesPackage{lltjp-xunicode}[2017/05/05 Patch to xunicode for LuaTeX-ja]
\def\XeTeXpicfile{}
-\RequirePackage{xunicode,luatexja}
+\RequirePackage{xunicode}
{\catcode`\"=12
\gdef\check at hexcom@digits@#1#2#3#4#5@!@#6#7#8{%
\ifx @#4\relax
More information about the tex-live-commits
mailing list