diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-09 22:10:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-09 22:10:04 +0000 |
commit | 2330a608b2d932767bc44fb7cc0110fc5568e004 (patch) | |
tree | 68f2eed1cfda6fd6d79151acc574b2aaffa1646a | |
parent | 52b7027c0c88a76cc7213b1c1ff857c6a3a51b79 (diff) |
luatexja (9feb20)
git-svn-id: svn://tug.org/texlive/trunk@53739 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/README | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | bin | 531845 -> 531789 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | bin | 939105 -> 939101 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty | 76 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 |
7 files changed, 53 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index f0d4a0e9b48..4b90edfbf8f 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 20200127.0 +The LuaTeX-ja Package 20200209.0 -------------------------------- Copyright (c) 2011--2020 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -43,9 +43,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20200127.0 in the Git repository by + or tagged as 20200209.0 in the Git repository by <http://git.osdn.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20200127.0;sf=tgz> + ;a=snapshot;h=refs/tags/20200209.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -93,4 +93,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Jan 27 16:16:24 2020 +0900 +Last commit date: Sun Feb 9 22:23:24 2020 +0900 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 5a23c46595b..423dc450abd 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 15bf08d2415..e08555de70e 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/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 5b53dcabaec..90d2e1f7c2e 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{20200127.0} +\def\LuaTeXjaversion{20200209.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 347f66b4688..802ec029a32 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2019/09/26 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2020/02/07 Default font settings of LuaTeX-ja] \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi @@ -32,7 +32,7 @@ \newcommand\kanjiencodingdefault{JY3} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\ifdefined\shapedefault +\ifdefined\@rmfamilyhook %% LaTeX 2020-02-02 \newcommand\kanjishapedefault{\shapedefault} \else @@ -105,7 +105,7 @@ \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}% \else \PackageWarningNoLine{luatexja}{% - Patching to \expandafter\string\csname #1\endcsname\space failed + Patching to \expandafter\string\csname #1\endcsname\space failed% }% \fi \fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index f2d78fb653a..adc7f66edfc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2020/01/26 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2020/02/07 Patch to NFSS2 for LuaTeX-ja] %% patching \DeclareTextComposite \def\ltj@chardef@text@cmd#1{% @@ -572,58 +572,59 @@ %%%% LaTeX 2020-02-02 \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} -\DeclareRobustCommand\fontseriesforce[1]{\kanjiseries{#1}\romanseries{#1}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} -\DeclareRobustCommand\fontshapeforce[1]{\kanjishape{#1}\romanshape{#1}} +\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}} -\def\merge@font@kanji@series#1{% +\def\merge@kanji@series#1{% \expandafter\expandafter\expandafter - \merge@font@kanji@series@ + \merge@kanji@series@ \csname series@\k@series @#1\endcsname {#1}% \@nil } -\def\set@target@kanji@series#1{% +\def\set@target@series@kanji#1{% \edef\k@series{#1}% \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}% } -\def\merge@font@kanji@series@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty - \set@target@kanji@series{#2}% +\def\merge@kanji@series@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \set@target@series@kanji{#2}% \else \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup - \edef\@reserveda{\k@encoding /\k@family /#1/\k@shape}% - \ifcsname \@reserveda \endcsname - \set@target@kanji@series{#1}% + \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}% + \ifcsname \reserved@a \endcsname + \set@target@series@kanji{#1}% \else \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname - \set@target@kanji@series{#2}% + \set@target@series@kanji{#2}% {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% \else - \set@target@kanji@series{#3}% + \set@target@series@kanji{#3}% {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% \fi \fi \fi } -\def\merge@font@kanji@shape#1{% +\def\merge@kanji@shape#1{% \expandafter\expandafter\expandafter - \merge@font@kanji@shape@ + \merge@kanji@shape@ \csname shape@\k@shape @#1\endcsname {#1}% \@nil } -\def\merge@font@kanji@shape@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty +\def\merge@kanji@shape@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty \edef\k@shape{#2}% \else - \maybe@load@fontshape - \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% - \ifcsname \@reserveda\endcsname + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}% + \ifcsname \reserved@a\endcsname \edef\k@shape{#1}% \else \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname @@ -637,13 +638,19 @@ \fi } \DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} -\DeclareRobustCommand\kanjiseries[1]{\merge@font@kanji@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} \DeclareRobustCommand\fontseries[1]{% - \merge@font@series{#1}\merge@font@kanji@series{#1}} + \merge@font@series{#1}\merge@kanji@series{#1}} \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} -\DeclareRobustCommand\kanjishape[1]{\merge@font@kanji@shape{#1}} +\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} \DeclareRobustCommand\fontshape[1]{% - \merge@font@shape{#1}\merge@font@kanji@shape{#1}} + \merge@font@shape{#1}\merge@kanji@shape{#1}} +\DeclareRobustCommand\usekanji[4]{% + \kanjiencoding{#1}\edef\k@family{#2}\edef\k@series{#3}\edef\k@shape{#4}% + \selectfont\ignorespaces} +\DeclareRobustCommand\useroman[4]{% + \romanencoding{#1}\edef\f@family{#2}\edef\f@series{#3}\edef\f@shape{#4}% + \selectfont\ignorespaces} \else %%%% LaTeX 2019-10-01 \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} @@ -652,14 +659,14 @@ \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} -\fi -%%%% \DeclareRobustCommand\usekanji[4]{% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% \selectfont\ignorespaces} \DeclareRobustCommand\useroman[4]{% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% \selectfont\ignorespaces} +\fi +%%%% \protected\def\usefont#1#2#3#4{% \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{#1}')}\ifin@% \usekanji{#1}{#2}{#3}{#4}% @@ -675,13 +682,18 @@ %%%% LaTeX 2020-02-02 \let\prepare@family@series@update@kanji=\prepare@family@series@update \patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{} +\patchcmd\prepare@family@series@update@kanji{\update@series@target@value}{\update@series@target@value@kanji}{}{} +\patchcmd\prepare@family@series@update@kanji{\@meta@family@list}{\@meta@family@list@kanji}{}{} \patchcmd\prepare@family@series@update@kanji{\fontfamily}{\kanjifamily}{}{} -\patchcmd\prepare@family@series@update@kanji{\f@series}{\k@series}{}{} \patchcmd\prepare@family@series@update@kanji{\maybe@load@fontshape} {\begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup}{}{} -\patchcmd\prepare@family@series@update@kanji{\@meta@family@list}{\@meta@family@kanji@list}{}{} -\def\@meta@family@kanji@list{\@elt{mc}\@elt{gt}\@elt{jtt}} +\patchcmd\prepare@family@series@update@kanji{\f@series}{\k@series}{}{} +\let\update@series@target@value@kanji=\update@series@target@value +\patchcmd\update@series@target@value@kanji{\f@family}{\k@family}{}{} +\patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{} + +\def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}} \DeclareRobustCommand\bfseries{% \not@math@alphabet\bfseries\mathbf \expand@font@defaults diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index ec460cb9672..682734fc573 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -689,6 +689,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'lecturer', "&MAKEflatten", 'ledmpar', "die 'skipping, use ledmac'", 'ledpar', "die 'skipping, use ledmac'", + 'leiletter', "die 'skipping, nonfree font (minion)'", 'letter1', "die 'skipping, ca.1989, never in TL, await request'", 'lettrgth', "die 'skipping, nonfree font'", 'lettrine', "&MAKEflatten", |