From c909c2b26109b8e71e2eeb5023939e084b7c0a2c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Sep 2019 21:18:32 +0000 Subject: luatexja (26sep19) git-svn-id: svn://tug.org/texlive/trunk@52180 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/patches/lltjcore.sty | 6 +++--- .../tex/luatex/luatexja/patches/lltjdefs.sty | 15 ++++++++++----- .../tex/luatex/luatexja/patches/lltjfont.sty | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches') diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 100a1c2b7eb..13bbc63ce12 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2018/06/15 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2019/09/26 Patch to LaTeX2e Kernel for LuaTeX-ja] \RequirePackage{etoolbox} \def\cleardoublepage{\clearpage\if@twoside @@ -233,13 +233,13 @@ \csname bm@#3\endcsname}% \if@pboxsw \m@th$\null\fi% !!! \@end@tempboxa} -\def\underline#1{% +\DeclareRobustCommand\underline[1]{% \relax \ifmmode\@@underline{#1}% \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi} %%% AtBeginDvi -\def \AtBeginDvi #1{% +\DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox \vbox{\yoko\unvbox \@begindvibox #1}% } diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 52649e84265..204adbc62e4 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/08/21 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2019/09/26 Default font settings of LuaTeX-ja] \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi @@ -106,7 +106,7 @@ "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF, "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF, - "1F300-"1FFFF + "1F300-"1FFFF, "2000-"206F } % non-Japanese \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF} \ltjdefcharrange{6}{% @@ -119,7 +119,13 @@ "A960-"A97F, "AC00-"D7FF } \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7} -\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}} +\ltjdefcharrange{9}{ + "2002, "2010, "2011, "2013, "2014, "2015, "2016, "2018, "2019, + "201A, "201C, "201D, "201E, "2020, "2021, "2022, "2025, "2026, + "2030, "2032, "2033, "2039, "203A, "203B, "203C, "203E, "203F, + "2042, "2044, "2047, "2048, "2049, "2051 +} +\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8, +9}} \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end} \protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} @@ -148,8 +154,7 @@ MIDDLE % Greek and Coptic, Cyrillic, Greek Extended \ltjdefcharrange{3}{% - "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF} - % 66 "2000-"206F num = 140/112 name = General Punctuation + "2070-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF} % 67 "2070-"209F num = 68/48 name = Superscripts and Subscripts % 68 "20A0-"20CF num = 5/48 name = Currency Symbols % 69 "20D0-"20FF num = 2/48 name = Combining Diacritical Marks for Symbols diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 8068d3326b8..0f572b52fc7 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}[2019/08/21 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2019/09/25 Patch to NFSS2 for LuaTeX-ja] \def\ltj@chardef@text@cmd#1{% \let\@ifdefinable\@@ifdefinable% @@ -65,7 +65,7 @@ \else\tstrutbox % tate and utod \fi\fi } -\def\strut{\relax +\DeclareRobustCommand\strut{\relax \ifnum\ltjgetparameter{direction}=1 % dtou \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi \else\ifnum\ltjgetparameter{direction}=4 % yoko @@ -75,13 +75,13 @@ \fi\fi } -\def\ystrut{\relax\hbox{\ltj@@orig@yoko +\DeclareRobustCommand\ystrut{\relax\hbox{\ltj@@orig@yoko \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} -\def\tstrut{\relax\hbox{\ltj@@orig@tate +\DeclareRobustCommand\tstrut{\relax\hbox{\ltj@@orig@tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} -\def\dstrut{\relax\hbox{\ltj@@orig@dtou +\DeclareRobustCommand\dstrut{\relax\hbox{\ltj@@orig@dtou \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi}} -\def\zstrut{\relax\hbox{\ltj@@orig@utod +\DeclareRobustCommand\zstrut{\relax\hbox{\ltj@@orig@utod \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} {% @@ -308,7 +308,7 @@ \fi } \newif\if@knjcmd -\def\userelfont{\@knjcmdtrue} +\DeclareRobustCommand\userelfont{\@knjcmdtrue} \RequirePackage{everysel} @@ -465,7 +465,7 @@ setdimen('cHT', ht+dp) end }\endgroup -\def\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner +\DeclareRobustCommand\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner \cvs\normalbaselineskip} \DeclareRobustCommand\romanencoding[1]{% \expandafter\ifx\csname T@#1\endcsname\relax @@ -574,10 +574,10 @@ \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} -\def\usekanji#1#2#3#4{% +\DeclareRobustCommand\usekanji[4]{% \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% \selectfont\ignorespaces} -\def\useroman#1#2#3#4{% +\DeclareRobustCommand\useroman[4]{% \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}% \selectfont\ignorespaces} \protected\def\usefont#1#2#3#4{% -- cgit v1.2.3