texlive[48296] Master/texmf-dist: luatexja (28jul18)
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 29 00:07:14 CEST 2018
Revision: 48296
http://tug.org/svn/texlive?view=revision&revision=48296
Author: karl
Date: 2018-07-29 00:07:14 +0200 (Sun, 29 Jul 2018)
Log Message:
-----------
luatexja (28jul18)
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/source/luatex/luatexja/ltjclasses.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.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.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2018-07-28 22:07:14 UTC (rev 48296)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20180616.0
+The LuaTeX-ja Package 20180728.0
--------------------------------
Copyright (c) 2011--2018 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -40,9 +40,9 @@
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20180616.0 in the Git repository by
+ or tagged as 20180728.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20180616.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20180728.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: Sat Jun 16 16:26:54 2018 +0900
+Last commit date: Sat Jul 28 08:33:45 2018 +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/source/luatex/luatexja/ltjclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2018-07-28 22:07:14 UTC (rev 48296)
@@ -115,6 +115,7 @@
% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更}
% \changes{v1.7g}{2017/09/19}{内部処理で使ったボックス0を空にした}
% \changes{v1.7h}{2018/02/04}{和文スケール値\cs{Cjascale}を定義}
+% \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更}
% \fi
%
% \iffalse
@@ -144,7 +145,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -4448,8 +4449,11 @@
% \changes{v1.0h}{1996/12/17}{Typo:和歴 to 和暦}
% |\today|コマンドの`年'を、
% 西暦か和暦のどちらで出力するかを指定するコマンドです。
+% 2018年7月以降の日本語\TeX{}開発コミュニティ版(v1.8)では、
+% デフォルトを和暦ではなく西暦に設定しています。
+% \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更}
% \begin{macrocode}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
\def\西暦{\西暦true}
\def\和暦{\西暦false}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-07-28 22:07:14 UTC (rev 48296)
@@ -44,7 +44,7 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2018/06/09 ltjsclasses ]
+ [2018/07/24 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass{ltjsarticle}
@@ -790,9 +790,13 @@
%
% [2017-02-17 LTJ] |\directlua|中で出力される数字のカテゴリーコードが12になるようにしました．
% この保証をしないと例えば\texttt{listings}パッケージで無限ループになります．
+%
+% [2018-07-02 LTJ] 10ptオプションが指定されており，
+% 実際にはオプティカルサイズの補正が不要なときは「|xreal|オプションは指定されなかった」という
+% 扱いにしておきます．
% \begin{macrocode}
\ifjsc at mag@xreal
-\ifdim\jsc at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\jsc at mag@xrealfalse\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
\expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
@@ -3397,6 +3401,7 @@
% \end{macro}
%
% \begin{macro}{\paragraph}
+% \begin{macro}{\jsParagraphMark}
%
% 見出しの後ろで改行されません。
%
@@ -3425,6 +3430,7 @@
\fi
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\subparagraph}
%
@@ -4710,11 +4716,24 @@
% \end{macro}
%
% \begin{macro}{\@dottedtocline}
+% \begin{macro}{\jsTocLine}
%
% \LaTeX 本体（\texttt{ltsect.dtx} 参照）での定義と同じですが，
% |\@tempdima| を |\@lnumwidth| に変えています。
%
+% [2018-06-23] デフォルトでは\jsTocLine のようにベースラインになります。\par
+% これを変更可能にするため，|\jsTocLine| というマクロに切り出しました。
+% 例えば，仮想ボディの中央
+% {\renewcommand{\jsTocLine}{\leaders \hbox {\hss ・\hss}\hfill}\jsTocLine}
+% に変更したい場合は
+%\begin{verbatim}
+% \renewcommand{\jsTocLine}{\leaders \hbox {\hss ・\hss}\hfill}
+%\end{verbatim}
+% とします。
+%
% \begin{macrocode}
+\def\jsTocLine{\leaders\hbox{%
+ $\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
\vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -4724,11 +4743,11 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
+ \jsTocLine \nobreak\hb at xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% \paragraph{図目次と表目次}
%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2018-07-28 22:07:14 UTC (rev 48296)
@@ -640,7 +640,7 @@
local bh = getlist(b)
local box_dir, dn = get_box_dir(b, ltjs.list_dir)
-- 既に b の中身にあるwhatsit
- if not dn then
+ if (box_dir<dir_node_auto) and (not dn) then
bh = create_dir_whatsit(bh, 'make_dir_whatsit', dir_yoko)
dn = bh; setfield(b, 'head', bh)
end
@@ -1105,6 +1105,11 @@
local finalize_inner
local function finalize_dir_node(db,new_dir)
local b = getlist(db)
+ if getid(b)==id_whatsit and getsubtype(b)==sid_user
+ and getfield(b, 'user_id')==DIR then
+ local ob = b; b = node_remove(b,b); setfield(db, 'head', b);
+ node_free(ob)
+ end
finalize_inner(b)
local w = getfield(b, 'width')
local h = getfield(b, 'height')
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -779,7 +779,7 @@
\kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1em
\noindent\hb at xt@ 1.8em{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -882,7 +882,7 @@
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
\noindent\hb at xt@ 1.8em{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -878,7 +878,7 @@
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
\noindent\hb at xt@ 1.8em{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2018/06/09 ltjsclasses ]
+ [2018/07/24 ltjsclasses ]
\def\jsc at clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -241,7 +241,7 @@
\ifdim\jsc at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
\renewcommand{\@ptsize}{-20}\fi\fi
\ifjsc at mag@xreal
-\ifdim\jsc at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\jsc at mag@xrealfalse\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
\expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
@@ -1277,6 +1277,8 @@
\@dottedtocline{5}{\@tempdima}{6\zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
+\def\jsTocLine{\leaders\hbox{%
+ $\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
\vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -1286,8 +1288,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
+ \jsTocLine \nobreak\hb at xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\section*{\listfigurename}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2018/06/09 ltjsclasses ]
+ [2018/07/24 ltjsclasses ]
\def\jsc at clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -249,7 +249,7 @@
\ifdim\jsc at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
\renewcommand{\@ptsize}{-20}\fi\fi
\ifjsc at mag@xreal
-\ifdim\jsc at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\jsc at mag@xrealfalse\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
\expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
@@ -1362,6 +1362,8 @@
\@dottedtocline{5}{\@tempdima}{6.5\zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
+\def\jsTocLine{\leaders\hbox{%
+ $\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
\vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -1371,8 +1373,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
+ \jsTocLine \nobreak\hb at xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\if at twocolumn\@restonecoltrue\onecolumn
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2018/06/09 ltjsclasses ]
+ [2018/07/24 ltjsclasses ]
\def\jsc at clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -241,7 +241,7 @@
\ifdim\jsc at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
\renewcommand{\@ptsize}{-20}\fi\fi
\ifjsc at mag@xreal
-\ifdim\jsc at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\jsc at mag@xrealfalse\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
\expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
@@ -1239,6 +1239,8 @@
\@dottedtocline{5}{\@tempdima}{6\zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
+\def\jsTocLine{\leaders\hbox{%
+ $\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
\vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -1248,8 +1250,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
+ \jsTocLine \nobreak\hb at xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\section*{\listfigurename}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2018/06/09 ltjsclasses ]
+ [2018/07/24 ltjsclasses ]
\def\jsc at clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -240,7 +240,7 @@
\ifdim\jsc at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
\renewcommand{\@ptsize}{-20}\fi\fi
\ifjsc at mag@xreal
-\ifdim\jsc at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\jsc at mag@xrealfalse\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
\expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
@@ -1136,6 +1136,8 @@
\@dottedtocline{5}{\@tempdima}{6\zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
+\def\jsTocLine{\leaders\hbox{%
+ $\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
\vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -1145,8 +1147,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
+ \jsTocLine \nobreak\hb at xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\section*{\listfigurename}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2018/06/09 ltjsclasses ]
+ [2018/07/24 ltjsclasses ]
\def\jsc at clsname{ltjsreport}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -245,7 +245,7 @@
\ifdim\jsc at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
\renewcommand{\@ptsize}{-20}\fi\fi
\ifjsc at mag@xreal
-\ifdim\jsc at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\jsc at mag@xrealfalse\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
\expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
@@ -1355,6 +1355,8 @@
\@dottedtocline{5}{\@tempdima}{6.5\zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
+\def\jsTocLine{\leaders\hbox{%
+ $\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
\vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
@@ -1364,8 +1366,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
+ \jsTocLine \nobreak\hb at xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\if at twocolumn\@restonecoltrue\onecolumn
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -794,7 +794,7 @@
\kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1\zw
\noindent\hb at xt@ 2\zw{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -897,7 +897,7 @@
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1\zw
\noindent\hb at xt@ 2\zw{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -893,7 +893,7 @@
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1\zw
\noindent\hb at xt@ 2\zw{\hss\@makefnmark}#1}
-\newif\if西暦 \西暦false
+\newif\if西暦 \西暦true
\def\西暦{\西暦true}
\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
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 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2018-07-28 22:07:14 UTC (rev 48296)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2018/02/04 v1.7h-ltj-15
+ [2018/07/24 v1.8-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-07-28 22:06:09 UTC (rev 48295)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-07-28 22:07:14 UTC (rev 48296)
@@ -34,10 +34,10 @@
\expandafter\let\csname ifltj at in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2018/06/16 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2018/07/28 Japanese Typesetting with Lua(La)TeX]
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20180616.0}
+\def\LuaTeXjaversion{20180728.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
More information about the tex-live-commits
mailing list