summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/patches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-08-26 21:07:07 +0000
committerKarl Berry <karl@freefriends.org>2019-08-26 21:07:07 +0000
commit6dddb9db47abe97ad6955d2d04f339ca96389e48 (patch)
tree93bd972ad0216449dd38653046810b4a314cf9b6 /Master/texmf-dist/tex/luatex/luatexja/patches
parentbfd55e1fa306b0e1c0db5fc689fb45b81d5da0c8 (diff)
luatexja (26aug19)
git-svn-id: svn://tug.org/texlive/trunk@51963 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty27
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty2
11 files changed, 36 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index 91827a3b7fd..52649e84265 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/05/01 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2019/08/21 Default font settings of LuaTeX-ja]
\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
@@ -17,6 +17,10 @@
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY3}{}{}
\DeclareKanjiSubstitution{JY3}{mc}{m}{n}
\DeclareTateKanjiEncoding{JT3}{}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 6c25efadc42..8068d3326b8 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/01/29 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2019/08/21 Patch to NFSS2 for LuaTeX-ja]
\def\ltj@chardef@text@cmd#1{%
\let\@ifdefinable\@@ifdefinable%
@@ -228,6 +228,7 @@
\def\default@series{#3}%
\def\default@shape{#4}}%
\fi}
+\@onlypreamble\DeclareKanjiSubstitution
\def\DeclareErrorKanjiFont#1#2#3#4#5{%
\xdef\error@kfontshape{%
\noexpand\expandafter\noexpand\split@name\noexpand\string
@@ -236,12 +237,7 @@
\gdef\default@k@family{#2}%
\gdef\default@k@series{#3}%
\gdef\default@k@shape{#4}%
- \global\let\k@family\default@k@family
- \global\let\k@series\default@k@series
- \global\let\k@shape\default@k@shape
- \gdef\f@size{#5}%
- \gdef\f@baselineskip{#5pt}}
-\@onlypreamble\DeclareKanjiSubstitution
+ }
\@onlypreamble\DeclareErrorKanjiFont
\newif\ifltjselectfont@force@define
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
index 4cc3d0c0171..989fd8ce9d4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
@@ -5,7 +5,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{lltjp-array}[2018/03/29 Patch to array for LuaTeX-ja]
-\RequirePackage{etoolbox,array,luatexja}
+\RequirePackage{etoolbox,array}
\patchcmd\insert@column{%
\ignorespaces\@sharp\unskip
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
index 40f8c1e94e0..6f469fc08ff 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{fontspec,luatexja}
+\RequirePackage{fontspec}
\ExplSyntaxOn
% <= v2.6g uses \l__fontspec_nfss_enc_tl instead of \g__fontspec_nfss_enc_tl
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 8b71f591e1f..db2fac84813 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
@@ -1,21 +1,32 @@
%
-% lltjp-microtype.sty 2019-03-29
+% lltjp-microtype.sty 2019-08-12
%
% (Work in Progress)
%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{etoolbox}
-\RequirePackage{luatexja}
\makeatletter
\def\MT@register@font{%
- \xdef\MT@font@list{\expandonce{\MT@font@list}\MT@font,}%
+ \xdef\MT@font@list{\expandonce{\MT@font@list\MT@font},}% !!!
}
\def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list
\ifMT@inlist@\else
- \xdef\MT@font@list{\expandonce{\MT@font@list}\font@name,}%
+ \xdef\MT@font@list{\expandonce{\MT@font@list\font@name},}% !!!
\fi}
+\let\ltj@MT@tracking@\MT@tracking@
+\def\MT@tracking@{%
+ \MT@exp@one@n\MT@in@clist\MT@font\MT@tr@font@list
+ \ifMT@inlist@\else
+ \MT@maybe@do{tr}%
+ \ifMT@do\else
+ \xdef\MT@tr@font@list{\expandonce{\MT@tr@font@list\MT@font,}}% !!!
+ \fi
+ \fi
+}
+\ifx\MT@tracking\ltj@MT@tracking@\let\MT@tracking\MT@tracking@\fi
+
%\endinput
\begingroup
@@ -23,10 +34,11 @@
/MT@map@tlist@n{/\LτJCHAREX}/@makeother /lccode`/τ=`/t
/lowercase{%
/def/x{/endgroup
+ /def/MT@charstring{\CHAR"}%
/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
+ /expandafter/MT@is@char@ltja/MT@strip@prefix##1>/relax\LτJALCHAR\LτJALCHAR/relax
/else
/ifx/relax##1/relax
/if##3\/relax
@@ -40,15 +52,16 @@
/fi
/fi
}%
+ /def/MT@ltjs@drop@##1>##2/relax{##1}%
/def/MT@is@char@ltja##1\LτJALCHAR##2\LτJALCHAR##3/relax{%
+ %/typeout{MICLTJA <##1><##2><##3>}%
/ifx/relax##1/relax
/ifx/relax##2/relax/else
- /edef/MT@char@{/number##2}%
+ /edef/MT@char@{/expandafter/number/MT@ltjs@drop@##2>/relax}%
/fi
/fi
}%
}%
}
/x
-
\endinput
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty
index cfd8e527e6f..00602884eab 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty
@@ -5,7 +5,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{lltjp-preview}[2018/01/20 Patch to preview for LuaTeX-ja]
-\RequirePackage{etoolbox,preview,luatexja}
+\RequirePackage{etoolbox,preview}
\newbox\ltj@preview@box
\patchcmd\pr@endbox{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
index 09a2ad96c11..c6bebc36cde 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{luatexja}
+\RequirePackage{siunitx}
\makeatletter
\ExplSyntaxOn
\cs_generate_variant:Nn \tl_if_in:NnT { coT }
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty
index 6f7590c2a4d..e7535bd7e11 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{stfloats,luatexja}
+\RequirePackage{stfloats}
\RequirePackage{etoolbox}
\newif\ifltj@stfloats@fnbelowfloat
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty
index 31cbef3e737..d0ac424701a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty
@@ -9,7 +9,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{lltjp-tascmac}[2017/12/23 Patch to (t)ascmac for LuaTeX-ja]
-\RequirePackage{tascmac,luatexja}
+\RequirePackage{tascmac}
%% use Type1 font for ascgrp
\pdfextension mapline{+ascgrp <ascgrp.pfb}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
index fa974bbb846..d8c4055d14f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{unicode-math,luatexja,etoolbox}
+\RequirePackage{unicode-math,etoolbox}
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
index e35fe43664f..3d6e49fbaa7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
@@ -6,7 +6,7 @@
\ProvidesPackage{lltjp-xunicode}[2017/05/05 Patch to xunicode for LuaTeX-ja]
\def\XeTeXpicfile{}
-\RequirePackage{xunicode,luatexja}
+\RequirePackage{xunicode}
{\catcode`\"=12
\gdef\check@hexcom@digits@#1#2#3#4#5@!@#6#7#8{%
\ifx @#4\relax