From ff9df03313c1f230dc52fea2d78757a4821281da Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Sun, 1 Mar 2020 09:52:23 +0900 Subject: [PATCH] more fix --- doc/luatexja-en.pdf | Bin 531833 -> 531826 bytes doc/luatexja-ja.pdf | Bin 939140 -> 939144 bytes src/luatexja.sty | 4 ++-- src/patches/lltjfont.sty | 61 +++++++++++++++++++++++++++++++++-------------- 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/doc/luatexja-en.pdf b/doc/luatexja-en.pdf index 9e049fda92967e810f622fd7a809eaec76c248cb..098e57de650894c632792d49ef4949bdda5b88b9 100644 GIT binary patch delta 4048 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 delta 4020 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 W%k*O|hyWpMaF`++6l!3BVEZ4T1jva1 diff --git a/doc/luatexja-ja.pdf b/doc/luatexja-ja.pdf index 0794623c32c06ec7ae540ca5f405bbab29f6b791..3f189038c9b1a0c95140fc39902a2687eaa601f5 100644 GIT binary patch delta 6171 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 delta 6148 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 F{{yBRu(tpJ diff --git a/src/luatexja.sty b/src/luatexja.sty index 57a0a05..e3f36d1 100644 --- a/src/luatexja.sty +++ b/src/luatexja.sty @@ -35,13 +35,13 @@ \expandafter\let\csname ifltj@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@disablejfamtrue} \DeclareOption*{} \ProcessOptions\relax \fi % %%%% VERSION -\def\LuaTeXjaversion{20200227.0} +\def\LuaTeXjaversion{20200301.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty index d0bc61a..ca131bc 100644 --- a/src/patches/lltjfont.sty +++ b/src/patches/lltjfont.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2020/02/29 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2020/03/01 Patch to NFSS2 for LuaTeX-ja] %% patching \DeclareTextComposite \def\ltj@chardef@text@cmd#1{% @@ -568,17 +568,22 @@ \fi\fi } +\newcount\ltj@@latex@plv \ltj@@latex@plv=-1 \ifdefined\@rmfamilyhook %%%% LaTeX 2020-02-02 -\newif\ifltj@@latex@plv@develop -\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4 +\ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2 \@latex@error {Please update LaTeX2e!^^J\space\space - At least LaTeX2e 2020-02-02 patch level 5 is required} - {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.} + At least LaTeX2e 2020-02-02 patch level 3 is required} + {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.} \else - \unless\ifx\series@maybe@drop@one@m@x\@undefined % patch level 5 - \ltj@@latex@plv@developtrue + \ltj@@latex@plv=300 + \unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop + \ltj@@latex@plv=501 + \else + \unless\ifx\series@maybe@drop@one@m\@undefined % patch level 5 + \ltj@@latex@plv=500 + \fi \fi \fi @@ -590,17 +595,22 @@ \@nil } -\ifltj@@latex@plv@develop % 2020-02-02 pl5 + develop +\ifnum\ltj@@latex@plv>500 % pl5 + develop \def\set@target@series@kanji#1{% \edef\k@series{#1}% \series@maybe@drop@one@m\k@series\k@series } -\else +\else\ifnum\ltj@@latex@plv>300 % pl5 \def\set@target@series@kanji#1{% \edef\k@series{#1}% \expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series } -\fi +\else % pl 3, 4 + \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}% + } +\fi\fi \def\merge@kanji@series@#1#2#3\@nil{% \def\reserved@a{#3}% @@ -651,14 +661,25 @@ \fi \fi } -\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}} -\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}} -\DeclareRobustCommand\fontseries[1]{% - \@forced@seriesfalse\merge@font@series{#1}\merge@kanji@series{#1}} -\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\merge@font@series{#1}} -\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\merge@kanji@series{#1}} -\DeclareRobustCommand\fontseriesforce[1]{% - \@forced@seriestrue\merge@font@series{#1}\merge@kanji@series{#1}} +\ifnum\ltj@@latex@plv=300 % pl3, 4 + \DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} + \DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}} + \DeclareRobustCommand\fontseries[1]{% + \merge@font@series{#1}\merge@kanji@series{#1}} + \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} + \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} + \DeclareRobustCommand\fontseriesforce[1]{% + \edef\f@series{#1}\edef\k@series{#1}} +\else % pl 5 + \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}} + \DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}} + \DeclareRobustCommand\fontseries[1]{% + \@forced@seriesfalse\merge@font@series{#1}\merge@kanji@series{#1}} + \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\merge@font@series{#1}} + \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\merge@kanji@series{#1}} + \DeclareRobustCommand\fontseriesforce[1]{% + \@forced@seriestrue\merge@font@series{#1}\merge@kanji@series{#1}} +\fi \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} \DeclareRobustCommand\fontshape[1]{% @@ -672,6 +693,7 @@ \DeclareRobustCommand\useroman[4]{% \romanencoding{#1}\edef\f@family{#2}\edef\f@series{#3}\edef\f@shape{#4}% \selectfont\ignorespaces} +%%%% LaTeX 2020-02-02 END \else %%%% LaTeX 2019-10-01 \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} @@ -686,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{% @@ -703,6 +726,7 @@ %%%% 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{\fontfamily}{\kanjifamily}{}{} \patchcmd\prepare@family@series@update@kanji{\update@series@target@value}{\update@series@target@value@kanji}{}{} \patchcmd\prepare@family@series@update@kanji{\f@family}{\k@family}{}{} \patchcmd\prepare@family@series@update@kanji{\@meta@family@list}{\@meta@family@list@kanji}{}{} @@ -898,6 +922,7 @@ \aftergroup\subst@correction } \def\do@subst@correction{% + \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}% \ltj@@IsFontJapanese{\curr@fontshape}\ifin@% \ltj@@ja@do@subst@correction \else -- 2.11.0