diff options
Diffstat (limited to 'Master/texmf-dist')
38 files changed, 522 insertions, 1290 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 06fbe0a1e51..49ea080a43c 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20190328.0 +The LuaTeX-ja Package 20190407.0 -------------------------------- Copyright (c) 2011--2019 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -40,9 +40,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20190328.0 in the Git repository by + or tagged as 20190407.0 in the Git repository by <http://git.osdn.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20190328.0;sf=tgz> + ;a=snapshot;h=refs/tags/20190407.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -87,4 +87,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Thu Mar 28 17:45:21 2019 +0900 +Last commit date: Sun Apr 7 07:25:46 2019 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf Binary files differindex e8e0c93c474..35711733799 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf Binary files differindex ab0a081311f..299c6fb040f 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf Binary files differindex f51f0d27578..7331f38dc19 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf Binary files differindex 12e6c4a3fd6..f0e8334514c 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index 4e3117a012b..42ec1a0343b 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -3894,24 +3894,25 @@ Identity-Hとなり，PDFの標準規格ISO32000-1:2008~(\cite{pdfstd})に非準 %<*en> The default font defined by using \texttt{psft:} prefix is for Japanese typesetting; -it is Adobe-Japan1-6 CID-keyed font. +it is Adobe-Japan1-7 CID-keyed font. One can specify \texttt{cid} key to use other CID-keyed non-embedded fonts for Chinese or Korean typesetting. %</en> %<*ja> 標準で\texttt{psft:}プリフィックスで定義されるフォントは日本語用のもので -あり，Adobe-Japan1-6のCIDに対応したものとなる．しかし，\LuaTeX-jaは中国語 +あり，Adobe-Japan1-7のCIDに対応したものとなる．しかし，\LuaTeX-jaは中国語 の組版にも威力を発揮することが分かり，日本語フォントでない非埋込フォント の対応も必要となった．そのために追加されたのが\texttt{cid}キーである． \texttt{cid}キーに値を指定すると，そのCIDを持った非埋込フォントを定義することができる： %</ja> \begin{lstlisting}[numbers=left] -\jfont\testJ={psft:Ryumin-Light:cid=Adobe-Japan1-6;jfm=jis} % Japanese -\jfont\testD={psft:Ryumin-Light:jfm=jis} % default value is Adobe-Japan1-6 -\jfont\testC={psft:AdobeMingStd-Light:cid=Adobe-CNS1-6;jfm=jis} % Traditional Chinese +\jfont\testJ={psft:Ryumin-Light:cid=Adobe-Japan1-7;jfm=jis} % Japanese +\jfont\testD={psft:Ryumin-Light:jfm=jis} % default value is Adobe-Japan1-7 +\jfont\testC={psft:AdobeMingStd-Light:cid=Adobe-CNS1-7;jfm=jis} % Traditional Chinese \jfont\testG={psft:SimSun:cid=Adobe-GB1-5;jfm=jis} % Simplified Chinese \jfont\testK={psft:Batang:cid=Adobe-Korea1-2;jfm=jis} % Korean +\jfont\testKR={psft:SourceHanSerifAKR9:cid=Adobe-KR-9;jfm=jis} % Korean \end{lstlisting} %<*en> Note that the code above specifies \texttt{jfm-jis.lua}, which is for Japanese fonts, @@ -3923,11 +3924,11 @@ as JFM for Chinese and Korean fonts. %</ja> %<*en> -At present, \LuaTeX-ja supports only 4 values written in the sample code above. +At present, \LuaTeX-ja supports only 5 values written in the sample code above. Specifying other values, e.g., %</en> %<*ja> -今のところ，\LuaTeX-jaは上のサンプルコード中に書いた4つの値しかサポートしていない． +今のところ，\LuaTeX-jaは上のサンプルコード中に書いた5つの値しかサポートしていない． %</ja> \begin{lstlisting} \jfont\test={psft:Ryumin-Light:cid=Adobe-Japan2;jfm=jis} @@ -6868,13 +6869,14 @@ commands: \item[\cs{CID}\{<number>\}] %<*en> Typeset a glyph whose CID number is <number>. -If the Japanese font is neither Adobe-Japan1,~Adobe-GB1, Adobe-CNS1,~nor~Adobe-Korea1 CID-keyed font, +If the Japanese font is neither Adobe-Japan1,~Adobe-GB1, Adobe-CNS1, +Adobe-Korea1,~nor~Adobe-KR CID-keyed font, \LuaTeX-ja treats that <number> is a CID number of Adobe-Japan1 character collection, and tries to typeset a ``most suitable glyph''. %</en> %<*ja> CID番号が<number>の文字を出力する． -もし現在の和文フォントがAdobe-Japan1,~Adobe-GB1, Adobe-CNS1,~Adobe-Korea1の +もし現在の和文フォントがAdobe-Japan1,~Adobe-GB1, Adobe-CNS1, Adobe-Korea1,~Adobe-KRの いずれのCID-keyed fontでもない場合，<number>はAdobe-Japan1のCID番号であると解釈し 「適切なグリフ」\footnote{% 例えばフォントにIVDコレクションAdobe-Japan1が含まれていれば，その情報を用いて @@ -10816,6 +10818,7 @@ The following is the structure of the that table. \midrule Adobe-Japan1-*<j-cid-auto-adobe-japan1.lua&UniJIS2004-UTF32-*&Adobe-Japan1-UCS2\\ Adobe-Korea1-*<j-cid-auto-adobe-korea1.lua&UniKS-UTF32-*&Adobe-Korea1-UCS2\\ +Adobe-KR-*<j-cid-auto-adobe-kr.lua&UniAKR-UTF32-*&Adobe-KR-UCS2\\ Adobe-GB1-*<j-cid-auto-adobe-gb1.lua&UniGB-UTF32-*&Adobe-GB1-UCS2\\ Adobe-CNS1-*<j-cid-auto-adobe-cns1.lua&UniCNS-UTF32-*&Adobe-CNS1-UCS2\\ \bottomrule diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index ff744ea8902..c6f39b74d0c 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -117,6 +117,10 @@ % \changes{v1.7h}{2018/02/04}{和文スケール値\cs{Cjascale}を定義} % \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更} % \changes{v1.8-ltj-16}{2018/10/08}{Lua\TeX-jaが|disablejfam|オプションをサポートしたことによる変更} +% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策 +% (sync with ltsect.dtx 2018/09/26 v1.1c)} +% \changes{v1.8b}{2019/04/02}{新元号対応} + % \fi % % \iffalse @@ -146,7 +150,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} %</tate> - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 %<article|report|book> Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -162,6 +166,7 @@ \else \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset} \fi +\def\pLaTeX{p\kern-.05em\LaTeX} \usepackage[unicode]{hyperref} \title{Lua\LaTeX-ja用\texttt{jclasses}互換クラス} \author{Lua\TeX-jaプロジェクト} @@ -4075,13 +4080,15 @@ % ^^A このコマンドによる影響はありません。 % % このマクロは\file{ltsect.dtx}で定義されています。 +% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策 +% (sync with ltsect.dtx 2018/09/26 v1.1c)} % \begin{macrocode} \providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -%<tate>\@temptokena{\rensuji{\thepage}}}% -%<yoko>\@temptokena{\thepage}}% +%<tate> \@temptokena{\rensuji{\thepage}}}% +%<yoko> \@temptokena{\thepage}}% {\string\@writefile{#1}% {\protect\contentsline{#2}{#3}{\the\@temptokena}% \protected@file@percent}}% @@ -4473,6 +4480,7 @@ % % \begin{macro}{\heisei} % \changes{v1.1m}{1998/04/07}{\cs{today}の計算手順を変更} +% \changes{v1.8b}{2019/04/02}{\cs{heisei}の値は$\mbox{西暦}-1988$で固定} % |\today|コマンドを|\rightmark|で指定したとき、|\rightmark|を出力する部分 % で和暦のための計算ができないので、クラスファイルを読み込む時点で計算して % おきます。 @@ -4482,35 +4490,49 @@ % \end{macro} % % \begin{macro}{\today} +% \begin{macro}{\pltx@today@year} % 縦組の場合は、漢数字で出力します。 +% \pLaTeX\ 2018-12-01以前では縦数式ディレクション時でも漢数字で出力していましたが、 +% \pLaTeX\ 2019-04-06以降からはそうしなくなりました。 % % \changes{v1.6-ltj-9}{2015/01/01}{縦組では，この漢数字による日付出力でエラーになりました． % Lua\TeX-ja では，\cs{kansuji}の後に\cs{number}を続けることは出来ないので\cs{number}を削除しました．} +% \changes{v1.8b}{2019/04/02}{\cs{today}の計算・出力方法を変更。} % \begin{macrocode} -\def\today{{% - \ifnum\ltjgetparameter{direction}=3 - \if西暦 - \kansuji\year 年 - \kansuji\month 月 - \kansuji\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi - \kansuji\month 月 - \kansuji\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% + \else + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} % \end{macrocode} % \end{macro} +% \end{macro} % % % diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index 256a917828e..b816ad579ce 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -44,7 +44,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} %</driver> - [2018/10/08 ltjsclasses ] + [2019/04/06 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass[disablejfam]{ltjsarticle} @@ -5600,8 +5600,13 @@ % \paragraph{今日の日付} % % \LaTeX で処理した日付を出力します。 -% |ltjarticle| などと違って，標準を西暦にし，余分な空白が入らないように改良しました。 +% ^^A |jarticle| などと違って，標準を西暦にし， +% ^^A 余分な空白が入らないように改良しました。 +% ^^A -- 2018年7月以降は |jarticle| なども標準が西暦， +% ^^A -- 2019年4月以降は余分な空白が入らなくなっています。 % 和暦にするには |\和暦| と書いてください。 +% ちなみにこの文章の作成日は西暦では{\西暦\today}で， +% 和暦では{\和暦\today}です。 % % \begin{macro}{\today} % \begin{macrocode} @@ -5609,23 +5614,42 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax + \else + \number\numexpr\year-#1\relax\nobreak + \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% + \else + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua index 73435cd21d4..96fbd885abb 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.charrange', - date = '2018/02/18', + date = '2019/04/01', description = 'Handling the range of Japanese characters', }) luatexja.charrange = {} @@ -18,21 +18,20 @@ local ATTR_RANGE = 7 luatexja.charrange.ATTR_RANGE = ATTR_RANGE local jcr_cjk, jcr_noncjk = 0, 1 local floor = math.floor -local pow = math.pow local kcat_attr_table = {} local pow_table = {} local fn_table = {} -- used in is_ucs_in_japanese_char_direct local nfn_table = {} -- used in is_ucs_in_japanese_char_node for i = 0, 31*ATTR_RANGE-1 do - local ka, pw = luatexbase.attributes['ltj@kcat'..floor(i/31)], 1/pow(2, i%31) + local ka, pw = luatexbase.attributes['ltj@kcat'..floor(i/31)], 1/(2^(i%31)) local jcr_noncjk = jcr_noncjk - kcat_attr_table[i], pow_table[i] = ka, pow(2, i%31) + kcat_attr_table[i], pow_table[i] = ka, 2^(i%31) fn_table[i] = function(p) return floor(has_attr(p, ka)*pw)%2 ~= jcr_noncjk end nfn_table[i] = function(p) return floor(has_attr_node(p, ka)*pw)%2 ~= jcr_noncjk end end fn_table[-1] = function() return false end -- for char --U+007F nfn_table[-1] = function() return false end -- for char --U+007F -pow_table[31*ATTR_RANGE] = pow(2, 31) +pow_table[31*ATTR_RANGE] = 2^31 -- jcr_table_main[chr_code] = index -- index : internal 0, 1, 2, ..., 216 0: 'other' diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua deleted file mode 100644 index 1f277c90fa3..00000000000 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua +++ /dev/null @@ -1,1035 +0,0 @@ -return { - [0]=500, - { - ["shrink"]=26214, - ["shrink_order"]=0, - ["stretch"]=26214, - ["stretch_order"]=0, - ["width"]=0, - }, - { - ["shrink"]=65536, - ["shrink_order"]=0, - ["stretch"]=65536, - ["stretch_order"]=0, - ["width"]=157649, - }, - [256]=51, - [512]=52, - [768]=53, - [1024]=12295, - [1025]=19968, - [1026]=20108, - [1027]=19977, - [1028]=22235, - [1029]=20116, - [1030]=20845, - [1031]=19971, - [1032]=20843, - [1033]=20061, - [2097185]=10000, - [2097186]=10000, - [2097189]=500, - [2097190]=500, - [2097191]=10000, - [2097193]=10000, - [2097194]=500, - [2097195]=500, - [2097196]=10000, - [2097197]=10000, - [2097198]=10000, - [2097199]=500, - [2097210]=10000, - [2097211]=10000, - [2097215]=10000, - [2097245]=10000, - [2097322]=10000, - [2097330]=10000, - [2097331]=10000, - [2097332]=10000, - [2097335]=10000, - [2097337]=10000, - [2097338]=10000, - [2097339]=10000, - [2097872]=10000, - [2105369]=10000, - [2105373]=10000, - [2105381]=250, - [2105382]=250, - [2105404]=10000, - [2105415]=10000, - [2105416]=10000, - [2105417]=10000, - [2105634]=10000, - [2105874]=200, - [2107782]=10000, - [2109441]=10000, - [2109442]=10000, - [2109445]=10000, - [2109449]=10000, - [2109451]=10000, - [2109453]=10000, - [2109455]=10000, - [2109457]=10000, - [2109461]=10000, - [2109463]=10000, - [2109465]=10000, - [2109471]=10000, - [2109491]=10000, - [2109492]=10000, - [2109493]=10000, - [2109499]=10000, - [2109505]=150, - [2109507]=150, - [2109509]=150, - [2109511]=150, - [2109513]=150, - [2109539]=150, - [2109571]=150, - [2109573]=150, - [2109575]=150, - [2109582]=150, - [2109589]=150, - [2109590]=150, - [2109595]=10000, - [2109596]=10000, - [2109597]=10000, - [2109598]=10000, - [2109601]=150, - [2109603]=150, - [2109605]=150, - [2109607]=150, - [2109609]=150, - [2109635]=150, - [2109667]=150, - [2109669]=150, - [2109671]=150, - [2109678]=150, - [2109685]=150, - [2109686]=150, - [2109691]=10000, - [2109692]=10000, - [2109693]=10000, - [2109694]=10000, - [2109936]=150, - [2109937]=150, - [2109938]=150, - [2109939]=150, - [2109940]=150, - [2109941]=150, - [2109942]=150, - [2109943]=150, - [2109944]=150, - [2109945]=150, - [2109946]=150, - [2109947]=150, - [2109948]=150, - [2109949]=150, - [2109950]=150, - [2109951]=150, - [2162433]=10000, - [2162437]=200, - [2162438]=200, - [2162441]=10000, - [2162443]=200, - [2162444]=10000, - [2162445]=200, - [2162446]=10000, - [2162458]=10000, - [2162459]=10000, - [2162461]=200, - [2162463]=10000, - [2162493]=10000, - [2162525]=10000, - [2162528]=10000, - [2162529]=10000, - [2162531]=10000, - [2162532]=10000, - [2162590]=10000, - [2162591]=10000, - [4194339]=500, - [4194340]=500, - [4194344]=10000, - [4194395]=10000, - [4194400]=10000, - [4194465]=10000, - [4194475]=10000, - [4194495]=10000, - [4202520]=10000, - [4202524]=10000, - [4202668]=10000, - [4204933]=10000, - [4206600]=10000, - [4206602]=10000, - [4206604]=10000, - [4206606]=10000, - [4206608]=10000, - [4206612]=10000, - [4206614]=10000, - [4206616]=10000, - [4206621]=10000, - [4259587]=200, - [4259588]=200, - [4259592]=10000, - [4259643]=10000, - [4259648]=10000, - [4259675]=10000, - [4259679]=10000, - [4259682]=10000, - [6299648]=1, - [6299649]=1, - [6299650]=1, - [6299651]=1, - [6299652]=1, - [6299653]=1, - [6299654]=1, - [6299655]=1, - [6299656]=1, - [6299657]=1, - [6299658]=1, - [6299659]=1, - [6299660]=1, - [6299661]=1, - [6299662]=1, - [6299663]=1, - [6299664]=1, - [6299665]=1, - [6299666]=1, - [6299667]=1, - [6299668]=1, - [6299669]=1, - [6299670]=1, - [6299671]=1, - [6299672]=1, - [6299673]=1, - [6299674]=1, - [6299675]=1, - [6299676]=1, - [6299677]=1, - [6299678]=1, - [6299679]=1, - [6299680]=1, - [6299681]=1, - [6299682]=1, - [6299683]=1, - [6299684]=1, - [6299685]=1, - [6299686]=1, - [6299687]=1, - [6299688]=1, - [6299689]=1, - [6299690]=1, - [6299691]=1, - [6299692]=1, - [6299693]=1, - [6299694]=1, - [6299695]=1, - [6299696]=1, - [6299697]=1, - [6299698]=1, - [6299699]=1, - [6299700]=1, - [6299701]=1, - [6299702]=1, - [6299703]=1, - [6299704]=1, - [6299705]=1, - [6299706]=1, - [6299707]=1, - [6299708]=1, - [6299709]=1, - [6299710]=1, - [6299711]=1, - [6299712]=1, - [6299713]=1, - [6299714]=1, - [6299715]=1, - [6299716]=1, - [6299717]=1, - [6299718]=1, - [6299719]=1, - [6299720]=1, - [6299721]=1, - [6299722]=1, - [6299723]=1, - [6299724]=1, - [6299725]=1, - [6299726]=1, - [6299727]=1, - [6299728]=1, - [6299729]=1, - [6299730]=1, - [6299731]=1, - [6299732]=1, - [6299733]=1, - [6299734]=1, - [6299735]=1, - [6299736]=1, - [6299737]=1, - [6299738]=1, - [6299739]=1, - [6299740]=1, - [6299741]=1, - [6299742]=1, - [6299743]=1, - [6299744]=1, - [6299745]=1, - [6299746]=1, - [6299747]=1, - [6299748]=1, - [6299749]=1, - [6299750]=1, - [6299751]=1, - [6299752]=1, - [6299753]=1, - [6299754]=1, - [6299755]=1, - [6299756]=1, - [6299757]=1, - [6299758]=1, - [6299759]=1, - [6303744]=1, - [6303745]=1, - [6303746]=1, - [6303747]=1, - [6303748]=1, - [6303749]=1, - [6303750]=1, - [6303751]=1, - [6303752]=1, - [6303753]=1, - [6303754]=1, - [6303755]=1, - [6303756]=1, - [6303757]=1, - [6303758]=1, - [6303759]=1, - [6303760]=1, - [6303761]=1, - [6303762]=1, - [6303763]=1, - [6303764]=1, - [6303765]=1, - [6303766]=1, - [6303767]=1, - [6303768]=1, - [6303769]=1, - [6303770]=1, - [6303771]=1, - [6303772]=1, - [6303773]=1, - [6303774]=1, - [6303775]=1, - [6303776]=1, - [6303777]=1, - [6303778]=1, - [6303779]=1, - [6303780]=1, - [6303781]=1, - [6303782]=1, - [6303783]=1, - [6303784]=1, - [6303785]=1, - [6303786]=1, - [6303787]=1, - [6303788]=1, - [6303789]=1, - [6303790]=1, - [6303791]=1, - [6303792]=1, - [6303793]=1, - [6303794]=1, - [6303795]=1, - [6303796]=1, - [6303797]=1, - [6303798]=1, - [6303799]=1, - [6303800]=1, - [6303801]=1, - [6303802]=1, - [6303803]=1, - [6303804]=1, - [6303805]=1, - [6303806]=1, - [6303807]=1, - [6356736]=1, - [6356737]=1, - [6356738]=1, - [6356739]=1, - [6356740]=1, - [6356741]=1, - [6356742]=1, - [6356743]=1, - [6356744]=1, - [6356745]=1, - [6356746]=1, - [6356747]=1, - [6356748]=1, - [6356749]=1, - [6356750]=1, - [6356751]=1, - [6356752]=1, - [6356753]=1, - [6356754]=1, - [6356755]=1, - [6356756]=1, - [6356757]=1, - [6356758]=1, - [6356759]=1, - [6356760]=1, - [6356761]=1, - [6356762]=1, - [6356763]=1, - [6356764]=1, - [6356765]=1, - [6356766]=1, - [6356767]=1, - [6356768]=1, - [6356769]=1, - [6356770]=1, - [6356771]=1, - [6356772]=1, - [6356773]=1, - [6356774]=1, - [6356775]=1, - [6356776]=1, - [6356777]=1, - [6356778]=1, - [6356779]=1, - [6356780]=1, - [6356781]=1, - [6356782]=1, - [6356783]=1, - [6356784]=1, - [6356785]=1, - [6356786]=1, - [6356787]=1, - [6356788]=1, - [6356789]=1, - [6356790]=1, - [6356791]=1, - [6356792]=1, - [6356793]=1, - [6356794]=1, - [6356795]=1, - [6356796]=1, - [6356797]=1, - [6356798]=1, - [6356799]=1, - [6356800]=1, - [6356801]=1, - [6356802]=1, - [6356803]=1, - [6356804]=1, - [6356805]=1, - [6356806]=1, - [6356807]=1, - [6356808]=1, - [6356809]=1, - [6356810]=1, - [6356811]=1, - [6356812]=1, - [6356813]=1, - [6356814]=1, - [6356815]=1, - [6356816]=1, - [6356817]=1, - [6356818]=1, - [6356819]=1, - [6356820]=1, - [6356821]=1, - [6356822]=1, - [6356823]=1, - [6356824]=1, - [6356825]=1, - [6356826]=1, - [6356827]=1, - [6356828]=1, - [6356829]=1, - [6356830]=1, - [6356831]=1, - [6356832]=1, - [6356833]=1, - [6356834]=1, - [6356835]=1, - [6356836]=1, - [6356837]=1, - [6356838]=1, - [6356839]=1, - [6356840]=1, - [6356841]=1, - [6356842]=1, - [6356843]=1, - [6356844]=1, - [6356845]=1, - [6356846]=1, - [6356847]=1, - [6356848]=1, - [6356849]=1, - [6356850]=1, - [6356851]=1, - [6356852]=1, - [6356853]=1, - [6356854]=1, - [6356855]=1, - [6356856]=1, - [6356857]=1, - [6356858]=1, - [6356859]=1, - [6356860]=1, - [6356861]=1, - [6356862]=1, - [6356863]=1, - [6356864]=1, - [6356865]=1, - [6356866]=1, - [6356867]=1, - [6356868]=1, - [6356869]=1, - [6356870]=1, - [6356871]=1, - [6356872]=1, - [6356873]=1, - [6356874]=1, - [6356875]=1, - [6356876]=1, - [6356877]=1, - [6356878]=1, - [6356879]=1, - [6356880]=1, - [6356881]=1, - [6356882]=1, - [6356883]=1, - [6356884]=1, - [6356885]=1, - [6356886]=1, - [6356887]=1, - [6356888]=1, - [6356889]=1, - [6356890]=1, - [6356891]=1, - [6356892]=1, - [6356893]=1, - [6356894]=1, - [6356895]=1, - [6356896]=1, - [6356897]=1, - [6356898]=1, - [6356899]=1, - [6356900]=1, - [6356901]=1, - [6356902]=1, - [6356903]=1, - [6356904]=1, - [6356905]=1, - [6356906]=1, - [6356907]=1, - [6356908]=1, - [6356909]=1, - [6356910]=1, - [6356911]=1, - [6356912]=1, - [6356913]=1, - [6356914]=1, - [6356915]=1, - [6356916]=1, - [6356917]=1, - [6356918]=1, - [6356919]=1, - [6356920]=1, - [6356921]=1, - [6356922]=1, - [6356923]=1, - [6356924]=1, - [6356925]=1, - [6356926]=1, - [6356927]=1, - [6356928]=1, - [6356929]=1, - [6356930]=1, - [6356931]=1, - [6356932]=1, - [6356933]=1, - [6356934]=1, - [6356935]=1, - [6356936]=1, - [6356937]=1, - [6356938]=1, - [6356939]=1, - [6356940]=1, - [6356941]=1, - [6356942]=1, - [6356943]=1, - [6356944]=1, - [6356945]=1, - [6356946]=1, - [6356947]=1, - [6356948]=1, - [6356949]=1, - [6356950]=1, - [6356951]=1, - [6356952]=1, - [6356953]=1, - [6356954]=1, - [6356955]=1, - [6356956]=1, - [6356957]=1, - [6356958]=1, - [6356959]=1, - [6356960]=1, - [6356961]=1, - [6356962]=1, - [6356963]=1, - [6356964]=1, - [6356965]=1, - [6356966]=1, - [6356967]=1, - [6356968]=1, - [6356969]=1, - [6356970]=1, - [6356971]=1, - [6356972]=1, - [6356973]=1, - [6356974]=1, - [6356975]=1, - [8388608]=0, - [8388609]=0, - [8388610]=0, - [8388611]=0, - [8388612]=0, - [8388613]=0, - [8388614]=0, - [8388615]=0, - [8388616]=0, - [8388617]=0, - [8388618]=0, - [8388619]=0, - [8388620]=0, - [8388621]=0, - [8388622]=0, - [8388623]=0, - [8388624]=0, - [8388625]=0, - [8388626]=0, - [8388627]=0, - [8388628]=0, - [8388629]=0, - [8388630]=0, - [8388631]=0, - [8388632]=0, - [8388633]=0, - [8388634]=0, - [8388635]=0, - [8388636]=0, - [8388637]=0, - [8388638]=0, - [8388639]=0, - [8388640]=0, - [8388641]=0, - [8388642]=0, - [8388643]=0, - [8388644]=0, - [8388645]=0, - [8388646]=0, - [8388647]=2, - [8388648]=1, - [8388649]=2, - [8388650]=0, - [8388651]=0, - [8388652]=2, - [8388653]=0, - [8388654]=2, - [8388655]=0, - [8388656]=3, - [8388657]=3, - [8388658]=3, - [8388659]=3, - [8388660]=3, - [8388661]=3, - [8388662]=3, - [8388663]=3, - [8388664]=3, - [8388665]=3, - [8388666]=0, - [8388667]=2, - [8388668]=0, - [8388669]=0, - [8388670]=0, - [8388671]=0, - [8388672]=0, - [8388673]=3, - [8388674]=3, - [8388675]=3, - [8388676]=3, - [8388677]=3, - [8388678]=3, - [8388679]=3, - [8388680]=3, - [8388681]=3, - [8388682]=3, - [8388683]=3, - [8388684]=3, - [8388685]=3, - [8388686]=3, - [8388687]=3, - [8388688]=3, - [8388689]=3, - [8388690]=3, - [8388691]=3, - [8388692]=3, - [8388693]=3, - [8388694]=3, - [8388695]=3, - [8388696]=3, - [8388697]=3, - [8388698]=3, - [8388699]=1, - [8388700]=0, - [8388701]=2, - [8388702]=0, - [8388703]=0, - [8388704]=1, - [8388705]=3, - [8388706]=3, - [8388707]=3, - [8388708]=3, - [8388709]=3, - [8388710]=3, - [8388711]=3, - [8388712]=3, - [8388713]=3, - [8388714]=3, - [8388715]=3, - [8388716]=3, - [8388717]=3, - [8388718]=3, - [8388719]=3, - [8388720]=3, - [8388721]=3, - [8388722]=3, - [8388723]=3, - [8388724]=3, - [8388725]=3, - [8388726]=3, - [8388727]=3, - [8388728]=3, - [8388729]=3, - [8388730]=3, - [8388731]=0, - [8388732]=0, - [8388733]=0, - [8388734]=0, - [8388735]=0, - [8388736]=3, - [8388737]=3, - [8388738]=3, - [8388739]=3, - [8388740]=3, - [8388741]=3, - [8388742]=3, - [8388743]=3, - [8388744]=3, - [8388745]=3, - [8388746]=3, - [8388747]=3, - [8388748]=3, - [8388749]=3, - [8388750]=3, - [8388751]=3, - [8388752]=3, - [8388753]=3, - [8388754]=3, - [8388755]=3, - [8388756]=3, - [8388757]=3, - [8388758]=3, - [8388759]=3, - [8388760]=3, - [8388761]=3, - [8388762]=3, - [8388763]=3, - [8388764]=3, - [8388765]=3, - [8388766]=3, - [8388767]=3, - [8388768]=3, - [8388769]=1, - [8388770]=3, - [8388771]=3, - [8388772]=3, - [8388773]=0, - [8388774]=3, - [8388775]=3, - [8388776]=3, - [8388777]=3, - [8388778]=2, - [8388779]=1, - [8388780]=3, - [8388781]=3, - [8388782]=3, - [8388783]=3, - [8388784]=2, - [8388785]=3, - [8388786]=2, - [8388787]=2, - [8388788]=3, - [8388789]=3, - [8388790]=3, - [8388791]=3, - [8388792]=3, - [8388793]=2, - [8388794]=2, - [8388795]=2, - [8388796]=3, - [8388797]=3, - [8388798]=3, - [8388799]=1, - [8388800]=3, - [8388801]=3, - [8388802]=3, - [8388803]=3, - [8388804]=3, - [8388805]=3, - [8388806]=3, - [8388807]=3, - [8388808]=3, - [8388809]=3, - [8388810]=3, - [8388811]=3, - [8388812]=3, - [8388813]=3, - [8388814]=3, - [8388815]=3, - [8388816]=3, - [8388817]=3, - [8388818]=3, - [8388819]=3, - [8388820]=3, - [8388821]=3, - [8388822]=3, - [8388823]=3, - [8388824]=3, - [8388825]=3, - [8388826]=3, - [8388827]=3, - [8388828]=3, - [8388829]=3, - [8388830]=3, - [8388831]=3, - [8388832]=3, - [8388833]=3, - [8388834]=3, - [8388835]=3, - [8388836]=3, - [8388837]=3, - [8388838]=3, - [8388839]=3, - [8388840]=3, - [8388841]=3, - [8388842]=3, - [8388843]=3, - [8388844]=3, - [8388845]=3, - [8388846]=3, - [8388847]=3, - [8388848]=3, - [8388849]=3, - [8388850]=3, - [8388851]=3, - [8388852]=3, - [8388853]=3, - [8388854]=3, - [8388855]=3, - [8388856]=3, - [8388857]=3, - [8388858]=3, - [8388859]=3, - [8388860]=3, - [8388861]=3, - [8388862]=3, - [8388863]=3, - [8396820]=0, - [8396821]=0, - [8396824]=1, - [8396825]=2, - [8396828]=1, - [8396829]=2, - [8396838]=0, - [8396850]=2, - [8396851]=2, - [8396860]=2, - [8396871]=2, - [8396872]=2, - [8396873]=2, - [8396972]=1, - [8397090]=2, - [8398080]=0, - [8398081]=0, - [8398082]=0, - [8398083]=0, - [8398084]=0, - [8398085]=0, - [8398086]=0, - [8398087]=0, - [8398088]=0, - [8398089]=0, - [8398090]=0, - [8398091]=0, - [8398092]=0, - [8398093]=0, - [8398094]=0, - [8398095]=0, - [8398096]=0, - [8398097]=0, - [8398098]=0, - [8398099]=0, - [8398100]=0, - [8398101]=0, - [8398102]=0, - [8398103]=0, - [8398104]=0, - [8398105]=0, - [8398106]=0, - [8398107]=0, - [8398108]=0, - [8398109]=0, - [8398110]=0, - [8398111]=0, - [8398112]=0, - [8398113]=0, - [8398114]=0, - [8398115]=0, - [8398116]=0, - [8398117]=0, - [8398118]=0, - [8398119]=0, - [8398120]=0, - [8398121]=0, - [8398122]=0, - [8398123]=0, - [8398124]=0, - [8398125]=0, - [8398126]=0, - [8398127]=0, - [8398128]=0, - [8398129]=0, - [8398130]=0, - [8398131]=0, - [8398132]=0, - [8398133]=0, - [8398134]=0, - [8398135]=0, - [8398136]=0, - [8398137]=0, - [8398138]=0, - [8398139]=0, - [8398140]=0, - [8398141]=0, - [8398142]=0, - [8398143]=0, - [8398144]=0, - [8398145]=0, - [8398146]=0, - [8398147]=0, - [8398148]=0, - [8398149]=0, - [8398150]=0, - [8398151]=0, - [8398152]=0, - [8398153]=0, - [8398154]=0, - [8398155]=0, - [8398156]=0, - [8398157]=0, - [8398158]=0, - [8398159]=0, - [8398160]=0, - [8398161]=0, - [8398162]=0, - [8398163]=0, - [8398164]=0, - [8398165]=0, - [8398166]=0, - [8398167]=0, - [8398168]=0, - [8398169]=0, - [8398170]=0, - [8398171]=0, - [8398172]=0, - [8398173]=0, - [8398174]=0, - [8398175]=0, - [8398176]=0, - [8398177]=0, - [8398178]=0, - [8398179]=0, - [8398180]=0, - [8398181]=0, - [8398182]=0, - [8398183]=0, - [8398184]=0, - [8398185]=0, - [8398186]=0, - [8398187]=0, - [8398188]=0, - [8398189]=0, - [8398190]=0, - [8398191]=0, - [8398192]=0, - [8398193]=0, - [8398194]=0, - [8398195]=0, - [8398196]=0, - [8398197]=0, - [8398198]=0, - [8398199]=0, - [8398200]=0, - [8398201]=0, - [8398202]=0, - [8398203]=0, - [8398204]=0, - [8398205]=0, - [8398206]=0, - [8398207]=0, - [8399237]=1, - [8399238]=2, - [8400897]=2, - [8400898]=2, - [8400904]=1, - [8400905]=2, - [8400906]=1, - [8400907]=2, - [8400908]=1, - [8400909]=2, - [8400910]=1, - [8400911]=2, - [8400912]=1, - [8400913]=2, - [8400916]=1, - [8400917]=2, - [8400918]=1, - [8400919]=2, - [8400920]=1, - [8400921]=2, - [8400924]=0, - [8400925]=1, - [8400927]=2, - [8453896]=1, - [8453897]=2, - [8453900]=2, - [8453902]=2, - [8453915]=2, - [8453919]=2, - [8453947]=1, - [8453949]=2, - [8453979]=1, - [8453981]=2, - [8453982]=0, - [8453983]=1, - [8453984]=2, - [8453985]=2, - [8453986]=1, - [8453987]=2, - [8453988]=2, - [8454117]=0, -} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua index fdb308348f5..d083026abbb 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua @@ -120,7 +120,8 @@ do cidinfo.ordering ~= "Japan1" and cidinfo.ordering ~= "GB1" and cidinfo.ordering ~= "CNS1" and - cidinfo.ordering ~= "Korea1" then + cidinfo.ordering ~= "Korea1" and + cidinfo.ordering ~= "KR" then -- ltjb.package_warning('luatexja-otf', -- 'Current Japanese font (or other CJK font) "' -- ..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)') diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua index cf32261805d..2b5b2e58758 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua @@ -5,12 +5,12 @@ luatexja.load_module('base'); local ltjb = luatexja.base local cidfont_data = {} local cache_chars = {} -local cache_ver = 7 +local cache_ver = 8 local identifiers = fonts.hashes.identifiers local cid_reg, cid_order, cid_supp, cid_name local cid_replace = { - ["Adobe-Japan1"] = {"UniJIS2004-UTF32", 23057, 6, + ["Adobe-Japan1"] = {"UniJIS2004-UTF32", 23059, 7, function (i) if (231<=i and i<=632) or (8718<=i and i<=8719) or (12063<=i and i<=12087) then @@ -35,12 +35,22 @@ local cid_replace = { return 327680 -- 655360/2 end end}, - ["Adobe-CNS1"] = {"UniCNS-UTF32", 19155, 6, + ["Adobe-CNS1"] = {"UniCNS-UTF32", 19178, 7, function (i) if (13648<=i and i<=13742) or (i==17603) then return 327680 -- 655360/2 end end}, + ["Adobe-KR"] = {"UniAKR-UTF32", 22896, 9, + function (i) + if i==3057 then + return 655360*2 + elseif i==3058 then + return 655360*3 + elseif i==12235 or i==12236 then + return 163840 -- 655360/4 + end + end}, } -- reading CID maps @@ -88,18 +98,21 @@ do end local function open_cmap_file(name, inc, cid_dec, mke) - fh = io.open(kpse.find_file(name, 'cmap files'), "r") - line = fh:read("*l") - while line do - if string.find(line, "%x+%s+begin...?char") then - load_cid_char(cid_dec, mke) - elseif string.find(line, "%x+%s+begin...?range") then - load_cid_range(inc, cid_dec, mke) - else - line = fh:read("*l") + local fn = kpse.find_file(name, 'cmap files') + if fn then + local fh = io.open(fn, "r") + line = fh:read("*l") + while line do + if string.find(line, "%x+%s+begin...?char") then + load_cid_char(cid_dec, mke) + elseif string.find(line, "%x+%s+begin...?range") then + load_cid_range(inc, cid_dec, mke) + else + line = fh:read("*l") + end end + fh:close(); end - fh:close(); end local function increment(a) return a+1 end @@ -352,7 +365,7 @@ local function font_callback(name, size, id, fallback) if name:sub(1,1)=="{" and name:sub(-1)=="}" then name = name:sub(2,-2) end local p = name:find(":") or 0 if name:sub(1, p-1) == 'psft' then - local s = "Adobe-Japan1-6" + local s = "Adobe-Japan1-7" local basename = name:sub(p+1) local p = basename:find(":") local q = basename:find("/[BI][BI]?") diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 3a08f1680c0..884eeb90e29 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -684,7 +685,7 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\thepage}}% + \@temptokena{\thepage}}% {\string\@writefile{#1}% {\protect\contentsline{#2}{#3}{\the\@temptokena}% \protected@file@percent}}% @@ -785,27 +786,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \ifnum\ltjgetparameter{direction}=3 - \if西暦 - \kansuji\year 年 - \kansuji\month 月 - \kansuji\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi - \kansuji\month 月 - \kansuji\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 29093f3edc1..18d59619531 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index b0f792ec910..8265b54e331 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index 42073daa5c6..ae7da1cb5e8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index b3e5ea2ee6d..6ad203fcce0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -777,7 +778,7 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\thepage}}% + \@temptokena{\thepage}}% {\string\@writefile{#1}% {\protect\contentsline{#2}{#3}{\the\@temptokena}% \protected@file@percent}}% @@ -888,27 +889,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \ifnum\ltjgetparameter{direction}=3 - \if西暦 - \kansuji\year 年 - \kansuji\month 月 - \kansuji\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi - \kansuji\month 月 - \kansuji\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index b208e1c4922..d87b35efba2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -773,7 +774,7 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\thepage}}% + \@temptokena{\thepage}}% {\string\@writefile{#1}% {\protect\contentsline{#2}{#3}{\the\@temptokena}% \protected@file@percent}}% @@ -884,27 +885,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \ifnum\ltjgetparameter{direction}=3 - \if西暦 - \kansuji\year 年 - \kansuji\month 月 - \kansuji\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi - \kansuji\month 月 - \kansuji\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index e2dfed79cbb..7b015de3599 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2018/10/08 ltjsclasses ] + [2019/04/06 ltjsclasses ] \def\jsc@clsname{ltjsarticle} \def\Cjascale{0.924715} \RequirePackage{luatexja} @@ -1625,23 +1625,42 @@ class has defined the old font commands like\MessageBreak \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax + \else + \number\numexpr\year-#1\relax\nobreak + \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% + \else + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \if@slide \pagestyle{empty} \else \pagestyle{plain} \fi \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index ef9690bae9a..162b2364e6b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2018/10/08 ltjsclasses ] + [2019/04/06 ltjsclasses ] \def\jsc@clsname{ltjsbook} \def\Cjascale{0.924715} \RequirePackage{luatexja} @@ -1719,23 +1719,42 @@ class has defined the old font commands like\MessageBreak \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax + \else + \number\numexpr\year-#1\relax\nobreak + \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% + \else + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \if@report \pagestyle{plain} \else \pagestyle{headings} \fi \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index 2c445458ae2..0fd6055cc0a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index 983f9bab1df..d2445e45698 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index efd3aec0c52..c8e3ca64c24 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 22cb42bc1c3..3bb3ae09e20 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2018/10/08 ltjsclasses ] + [2019/04/06 ltjsclasses ] \def\jsc@clsname{ltjskiyou} \def\Cjascale{0.924715} \RequirePackage{luatexja} @@ -1590,23 +1590,42 @@ class has defined the old font commands like\MessageBreak \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax + \else + \number\numexpr\year-#1\relax\nobreak + \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% + \else + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{plain} \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index 5c7fd8a2eab..3e7b5d2d7d6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2018/10/08 ltjsclasses ] + [2019/04/06 ltjsclasses ] \def\jsc@clsname{ltjspf} \def\Cjascale{0.903375} \RequirePackage{luatexja} @@ -1484,23 +1484,42 @@ class has defined the old font commands like\MessageBreak \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax + \else + \number\numexpr\year-#1\relax\nobreak + \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% + \else + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{headings} \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls index 4b6803a301e..f28caebdc95 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsreport} - [2018/10/08 ltjsclasses ] + [2019/04/06 ltjsclasses ] \def\jsc@clsname{ltjsreport} \def\Cjascale{0.924715} \RequirePackage{luatexja} @@ -1713,23 +1713,42 @@ class has defined the old font commands like\MessageBreak \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax + \else + \number\numexpr\year-#1\relax\nobreak + \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% + \else + 令和\pltx@today@year@{2018}% + \fi\fi} \def\today{% \if@english \ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year + \else\if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 \else - \if西暦 - \number\year 年 - \number\month 月 - \number\day 日 - \else - 平成\number\heisei 年 - \number\month 月 - \number\day 日 - \fi - \fi} + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 + \fi\fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{plain} \pagenumbering{arabic} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 08db701933b..6c8e4fde857 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -699,7 +700,7 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\rensuji{\thepage}}}% + \@temptokena{\rensuji{\thepage}}}% {\string\@writefile{#1}% {\protect\contentsline{#2}{#3}{\the\@temptokena}% \protected@file@percent}}% @@ -800,27 +801,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \ifnum\ltjgetparameter{direction}=3 - \if西暦 - \kansuji\year 年 - \kansuji\month 月 - \kansuji\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi - \kansuji\month 月 - \kansuji\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index 496dae25d97..61825f2e1a6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index a8428e3e157..1db86d1fbb8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index c7d5f894972..72f211645a1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index b56c3b8516d..9815703c00d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -792,7 +793,7 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\rensuji{\thepage}}}% + \@temptokena{\rensuji{\thepage}}}% {\string\@writefile{#1}% {\protect\contentsline{#2}{#3}{\the\@temptokena}% \protected@file@percent}}% @@ -903,27 +904,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \ifnum\ltjgetparameter{direction}=3 - \if西暦 - \kansuji\year 年 - \kansuji\month 月 - \kansuji\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi - \kansuji\month 月 - \kansuji\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index 4949ba0c17e..447ee9e34d4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -788,7 +789,7 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -\@temptokena{\rensuji{\thepage}}}% + \@temptokena{\rensuji{\thepage}}}% {\string\@writefile{#1}% {\protect\contentsline{#2}{#3}{\the\@temptokena}% \protected@file@percent}}% @@ -899,27 +900,36 @@ \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax -\def\today{{% - \ifnum\ltjgetparameter{direction}=3 - \if西暦 - \kansuji\year 年 - \kansuji\month 月 - \kansuji\day 日 +\def\pltx@today@year@#1{% + \ifnum\numexpr\year-#1=1 元\else + \ifnum\ltjgetparameter{direction}=3 + \kansuji\numexpr\year-#1\relax \else - 平成\ifnum\heisei=1 元年\else\kansuji\heisei 年\fi - \kansuji\month 月 - \kansuji\day 日 + \number\numexpr\year-#1\relax\nobreak \fi + \fi 年 +} +\def\pltx@today@year{% + \ifnum\numexpr\year*10000+\month*100+\day<19890108 + 昭和\pltx@today@year@{1925}% + \else\ifnum\numexpr\year*10000+\month*100+\day<20190501 + 平成\pltx@today@year@{1988}% \else - \if西暦 - \number\year~年 - \number\month~月 - \number\day~日 - \else - 平成\ifnum\heisei=1 元年\else\number\heisei~年\fi - \number\month~月 - \number\day~日 - \fi + 令和\pltx@today@year@{2018}% + \fi\fi} +\def\today{{% + \if西暦 + \ifnum\ltjgetparameter{direction}=3 \kansuji\year + \else\number\year\nobreak\fi 年 + \else + \pltx@today@year + \fi + \ifnum\ltjgetparameter{direction}=3 + \kansuji\month 月 + \kansuji\day 日 + \else + \number\month\nobreak 月 + \number\day\nobreak 日 \fi}} \newcommand{\prepartname}{第} \newcommand{\postpartname}{部} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index 834522ee8c4..6fe390af3d2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index 6afec3c1ccf..02683226ed8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index fc7ab2967a0..5f5d5ecb8fd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -21,9 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx + \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2018/10/08 v1.8-ltj-16 + [2019/04/06 v1.8b-ltj-16 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 43d5d727917..6c7a9872e38 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -41,7 +41,7 @@ \ProcessOptions\relax \fi %</LaTeX> %%%% VERSION -\def\LuaTeXjaversion{20190328.0} +\def\LuaTeXjaversion{20190407.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty index 3f7c2208d1b..13f75e302e9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty @@ -196,6 +196,9 @@ \expandafter\expandafter\expandafter\lst@InsideConvert% \expandafter{\the\@temptokena}\lst@arg\lst@DeInit\egroup} +%%%%%%%%%%%%%%%% \lstMakeShortInline +\patchcmd\lstMakeShortInline@{\lst@shortinlinedef#1}{\lst@shortinlinedef~}{}{} + % We redefine \lst@BeginDropInput, since now we have % two additional `process macros'. \def\lst@BeginDropInput#1{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty index aacde2f22a0..8b71f591e1f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty @@ -1,5 +1,5 @@ % -% lltjp-microtype.sty 2019-03-28 +% lltjp-microtype.sty 2019-03-29 % % (Work in Progress) % @@ -16,4 +16,39 @@ \ifMT@inlist@\else \xdef\MT@font@list{\expandonce{\MT@font@list}\font@name,}% \fi} + +%\endinput +\begingroup + \catcode`\/=\z@ + /MT@map@tlist@n{/\LτJCHAREX}/@makeother /lccode`/τ=`/t + /lowercase{% + /def/x{/endgroup + /def/MT@is@char##1\CHAR"##2##3##4/relax{% + %/message{MIC <##1><##2><##3><##4>}% + /ifx/relax##4/relax + /expandafter/MT@is@char@ltja/MT@strip@prefix##1/relax\LτJALCHAR\LτJALCHAR/relax + /else + /ifx/relax##1/relax + /if##3\/relax + /edef/MT@char@{/number"##2}% + /MT@ifstreq/MT@charstring{##3##4}/relax/MT@norestfalse + /else + /edef/MT@char@{/number"##2##3}% + /MT@ifstreq/MT@charstring{##4}/relax + {/MT@is@xchar##2##3|##4\CHAR"/relax}% + /fi + /fi + /fi + }% + /def/MT@is@char@ltja##1\LτJALCHAR##2\LτJALCHAR##3/relax{% + /ifx/relax##1/relax + /ifx/relax##2/relax/else + /edef/MT@char@{/number##2}% + /fi + /fi + }% + }% + } +/x + \endinput |