texlive[53983] Master/texmf-dist: luatexja (1mar20)
commits+karl at tug.org
commits+karl at tug.org
Sun Mar 1 19:27:13 CET 2020
Revision: 53983
http://tug.org/svn/texlive?view=revision&revision=53983
Author: karl
Date: 2020-03-01 19:27:10 +0100 (Sun, 01 Mar 2020)
Log Message:
-----------
luatexja (1mar20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2020-03-01 02:03:29 UTC (rev 53982)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2020-03-01 18:27:10 UTC (rev 53983)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20200227.0
+The LuaTeX-ja Package 20200301.0
--------------------------------
Copyright (c) 2011--2020 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -43,9 +43,9 @@
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20200227.0 in the Git repository by
+ or tagged as 20200301.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20200227.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20200301.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -93,4 +93,4 @@
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Thu Feb 27 18:45:53 2020 +0900
+Last commit date: Sun Mar 1 09:56:08 2020 +0900
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/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2020-03-01 02:03:29 UTC (rev 53982)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2020-03-01 18:27:10 UTC (rev 53983)
@@ -35,13 +35,13 @@
\expandafter\let\csname ifltj at in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2020/01/27 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2020/03/01 Japanese Typesetting with Lua(La)TeX]
\DeclareOption{disablejfam}{\ltj at disablejfamtrue}
\DeclareOption*{}
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20200227.0}
+\def\LuaTeXjaversion{20200301.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2020-03-01 02:03:29 UTC (rev 53982)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2020-03-01 18:27:10 UTC (rev 53983)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2020/02/07 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2020/03/01 Patch to NFSS2 for LuaTeX-ja]
%% patching \DeclareTextComposite
\def\ltj at chardef@text at cmd#1{%
@@ -568,14 +568,24 @@
\fi\fi
}
+\newcount\ltj@@latex at plv \ltj@@latex at plv=-1
\ifdefined\@rmfamilyhook
%%%% LaTeX 2020-02-02
-\DeclareRobustCommand\romanseriesforce[1]{\edef\f at series{#1}}
-\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k at series{#1}}
-\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
-\DeclareRobustCommand\romanshapeforce[1]{\edef\f at shape{#1}}
-\DeclareRobustCommand\kanjishapeforce[1]{\edef\k at shape{#1}}
-\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}}
+\ifx\@forced at seriestrue\@undefined % 2020-02-02 pl0--2
+ \@latex at error
+ {Please update LaTeX2e!^^J\space\space
+ At least LaTeX2e 2020-02-02 patch level 3 is required}
+ {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
+\else
+ \ltj@@latex at plv=300
+ \unless\ifx\series at maybe@drop at one@m at x\@undefined % pl5 + develop
+ \ltj@@latex at plv=501
+ \else
+ \unless\ifx\series at maybe@drop at one@m\@undefined % patch level 5
+ \ltj@@latex at plv=500
+ \fi
+ \fi
+\fi
\def\merge at kanji@series#1{%
\expandafter\expandafter\expandafter
@@ -584,10 +594,24 @@
{#1}%
\@nil
}
-\def\set at target@series at kanji#1{%
- \edef\k at series{#1}%
- \edef\k at series{\expandafter\series at drop@one at m\k at series mm\series at drop@one at m}%
-}
+
+\ifnum\ltj@@latex at plv>500 % pl5 + develop
+ \def\set at target@series at kanji#1{%
+ \edef\k at series{#1}%
+ \series at maybe@drop at one@m\k at series\k at series
+ }
+\else\ifnum\ltj@@latex at plv>300 % pl5
+ \def\set at target@series at kanji#1{%
+ \edef\k at series{#1}%
+ \expandafter\series at maybe@drop at one@m\expandafter{\k at series}\k at series
+ }
+\else % pl 3, 4
+ \def\set at target@series at kanji#1{%
+ \edef\k at series{#1}%
+ \edef\k at series{\expandafter\series at drop@one at m\k at series mm\series at drop@one at m}%
+ }
+\fi\fi
+
\def\merge at kanji@series@#1#2#3\@nil{%
\def\reserved at a{#3}%
\ifx\reserved at a\@empty
@@ -637,14 +661,32 @@
\fi
\fi
}
-\DeclareRobustCommand\romanseries[1]{\merge at font@series{#1}}
-\DeclareRobustCommand\kanjiseries[1]{\merge at kanji@series{#1}}
-\DeclareRobustCommand\fontseries[1]{%
- \merge at font@series{#1}\merge at kanji@series{#1}}
+\ifnum\ltj@@latex at plv=300 % pl3, 4
+ \DeclareRobustCommand\romanseries[1]{\merge at font@series{#1}}
+ \DeclareRobustCommand\kanjiseries[1]{\merge at kanji@series{#1}}
+ \DeclareRobustCommand\fontseries[1]{%
+ \merge at font@series{#1}\merge at kanji@series{#1}}
+ \DeclareRobustCommand\romanseriesforce[1]{\edef\f at series{#1}}
+ \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k at series{#1}}
+ \DeclareRobustCommand\fontseriesforce[1]{%
+ \edef\f at series{#1}\edef\k at series{#1}}
+\else % pl 5
+ \DeclareRobustCommand\romanseries[1]{\@forced at seriesfalse\merge at font@series{#1}}
+ \DeclareRobustCommand\kanjiseries[1]{\@forced at seriesfalse\merge at kanji@series{#1}}
+ \DeclareRobustCommand\fontseries[1]{%
+ \@forced at seriesfalse\merge at font@series{#1}\merge at kanji@series{#1}}
+ \DeclareRobustCommand\romanseriesforce[1]{\@forced at seriestrue\merge at font@series{#1}}
+ \DeclareRobustCommand\kanjiseriesforce[1]{\@forced at seriestrue\merge at kanji@series{#1}}
+ \DeclareRobustCommand\fontseriesforce[1]{%
+ \@forced at seriestrue\merge at font@series{#1}\merge at kanji@series{#1}}
+\fi
\DeclareRobustCommand\romanshape[1]{\merge at font@shape{#1}}
\DeclareRobustCommand\kanjishape[1]{\merge at kanji@shape{#1}}
\DeclareRobustCommand\fontshape[1]{%
\merge at font@shape{#1}\merge at kanji@shape{#1}}
+\DeclareRobustCommand\romanshapeforce[1]{\edef\f at shape{#1}}
+\DeclareRobustCommand\kanjishapeforce[1]{\edef\k at shape{#1}}
+\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}}
\DeclareRobustCommand\usekanji[4]{%
\kanjiencoding{#1}\edef\k at family{#2}\edef\k at series{#3}\edef\k at shape{#4}%
\selectfont\ignorespaces}
@@ -651,6 +693,7 @@
\DeclareRobustCommand\useroman[4]{%
\romanencoding{#1}\edef\f at family{#2}\edef\f at series{#3}\edef\f at shape{#4}%
\selectfont\ignorespaces}
+%%%% LaTeX 2020-02-02 END
\else
%%%% LaTeX 2019-10-01
\DeclareRobustCommand\romanseries[1]{\edef\f at series{#1}}
@@ -665,6 +708,7 @@
\DeclareRobustCommand\useroman[4]{%
\romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
\selectfont\ignorespaces}
+%%%% LaTeX 2019-10-01 END
\fi
%%%%
\protected\def\usefont#1#2#3#4{%
@@ -682,7 +726,9 @@
%%%% LaTeX 2020-02-02
\let\prepare at family@series at update@kanji=\prepare at family@series at update
\patchcmd\prepare at family@series at update{\fontfamily}{\romanfamily}{}{}
+\patchcmd\prepare at family@series at update@kanji{\fontfamily}{\kanjifamily}{}{}
\patchcmd\prepare at family@series at update@kanji{\update at series@target at value}{\update at series@target at value@kanji}{}{}
+\patchcmd\prepare at family@series at update@kanji{\f at family}{\k at family}{}{}
\patchcmd\prepare at family@series at update@kanji{\@meta at family@list}{\@meta at family@list at kanji}{}{}
\patchcmd\prepare at family@series at update@kanji{\fontfamily}{\kanjifamily}{}{}
\patchcmd\prepare at family@series at update@kanji{\maybe at load@fontshape}
@@ -689,47 +735,42 @@
{\begingroup\let\f at encoding\k at encoding\let\f at family\k at family
\maybe at load@fontshape\endgroup}{}{}
\patchcmd\prepare at family@series at update@kanji{\f at series}{\k at series}{}{}
+\patchcmd\prepare at family@series at update@kanji{\f at series}{\k at series}{}{}
\let\update at series@target at value@kanji=\update at series@target at value
\patchcmd\update at series@target at value@kanji{\f at family}{\k at family}{}{}
\patchcmd\update at series@target at value@kanji{\f at series}{\k at series}{}{}
-
+\patchcmd\update at series@target at value@kanji{\f at series}{\k at series}{}{}
+\patchcmd\update at series@target at value@kanji{\f at series}{\k at series}{}{}
+\patchcmd\update at series@target at value@kanji{\f at series}{\k at series}{}{}
\def\@meta at family@list at kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
\DeclareRobustCommand\bfseries{%
\not at math@alphabet\bfseries\mathbf
\expand at font@defaults
- \romanseries{%
- \ifx\f at family\rmdef at ult \bfseries at rm
- \else\ifx\f at family\sfdef at ult \bfseries at sf
- \else\ifx\f at family\ttdef at ult \bfseries at tt
- \else \bfdefault
- \fi\fi\fi
- }%
- \kanjiseries{%
- \ifx\k at family\mcdef at ult \bfseries at mc
- \else\ifx\k at family\gtdef at ult \bfseries at gt
- \else\ifx\k at family\jttdef at ult\bfseries at jtt
- \else \bfdefault
- \fi\fi\fi
- }%
+ \ifx\f at family\rmdef at ult \romanseries\bfseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\bfseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\bfseries at tt
+ \else \romanseries\bfdefault
+ \fi\fi\fi
+ \ifx\k at family\mcdef at ult \kanjiseries\bfseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\bfseries at gt
+ \else\ifx\k at family\jttdef at ult\kanjiseries\bfseries at jtt
+ \else \kanjiseries\bfdefault
+ \fi\fi\fi
\selectfont
}
\DeclareRobustCommand\mdseries{%
\not at math@alphabet\mdseries\relax
\expand at font@defaults
- \romanseries{%
- \ifx\f at family\rmdef at ult \mdseries at rm
- \else\ifx\f at family\sfdef at ult \mdseries at sf
- \else\ifx\f at family\ttdef at ult \mdseries at tt
- \else \mddefault
- \fi\fi\fi
- }%
- \kanjiseries{%
- \ifx\k at family\mcdef at ult \mdseries at mc
- \else\ifx\k at family\gtdef at ult \mdseries at gt
- \else\ifx\k at family\jttdef at ult\mdseries at jtt
- \else \mddefault
- \fi\fi\fi
- }%
+ \ifx\f at family\rmdef at ult \romanseries\mdseries at rm
+ \else\ifx\f at family\sfdef at ult \romanseries\mdseries at sf
+ \else\ifx\f at family\ttdef at ult \romanseries\mdseries at tt
+ \else \romanseries\mddefault
+ \fi\fi\fi
+ \ifx\k at family\mcdef at ult \kanjiseries\mdseries at mc
+ \else\ifx\k at family\gtdef at ult \kanjiseries\mdseries at gt
+ \else\ifx\k at family\jttdef at ult\kanjiseries\mdseries at jtt
+ \else \kanjiseries\mddefault
+ \fi\fi\fi
\selectfont
}
\appto\expand at font@defaults{%
@@ -881,7 +922,7 @@
\aftergroup\subst at correction
}
\def\do at subst@correction{%
- \ltj@@IsFontJapanese{\curr at fontshape}\ifin@%
+ \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f at encoding}')}\ifin@%
\ltj@@ja at do@subst at correction
\else
\ltj@@al at do@subst at correction
More information about the tex-live-commits
mailing list.